diff --git a/fs_add_quest_steps.lua b/fs_add_quest_steps.lua
index f2de0b8..8879b83 100644
--- a/fs_add_quest_steps.lua
+++ b/fs_add_quest_steps.lua
@@ -90,6 +90,7 @@ yl_speak_up.input_fs_add_quest_steps = function(player, formname, fields)
 		yl_speak_up.show_fs(player, "msg", {
 				input_to = "yl_speak_up:add_quest_steps",
 				formspec = yl_speak_up.get_fs_quest_edit_error(res1.error_msg, "back")})
+		return
 	end
 	local pname = res1.pname
 	local q_id  = res1.q_id
@@ -156,6 +157,9 @@ yl_speak_up.input_fs_add_quest_steps = function(player, formname, fields)
 		return yl_speak_up.show_fs(player, "add_quest_steps")
 	end
 
+	if(mode == "embedded_select") then
+		return yl_speak_up.show_fs(player, "manage_quest_steps", work_step)
+	end
 	if(not(work_step)) then
 		return -- TODO
 	end
@@ -300,6 +304,7 @@ yl_speak_up.get_fs_add_quest_steps = function(player, param)
 		table.insert(formspec, "size[12.5,17.3]")
 	else
 		table.insert(formspec, "size[12.5,12.5]")
+		current_step = nil
 	end
 	-- add back button
 	table.insert(formspec, "button[8,0;2,0.7;back;Back]")
diff --git a/fs_manage_quest_steps.lua b/fs_manage_quest_steps.lua
index 04b1660..598318c 100644
--- a/fs_manage_quest_steps.lua
+++ b/fs_manage_quest_steps.lua
@@ -135,6 +135,12 @@ yl_speak_up.input_fs_manage_quest_steps = function(player, formname, fields)
 	end
 	local res = yl_speak_up.player_is_working_on_quest(player)
 	if(not(res.error_msg) and res.current_step) then
+		-- forward input from that formspec...
+		if((yl_speak_up.speak_to[res.pname].quest_step_mode == "embedded_select")
+		  and (fields.add_from_available
+		       or (fields.add_step and fields.add_quest_step))) then
+			return yl_speak_up.input_fs_add_quest_steps(player, "yl_speak_up:add_quest_steps", fields)
+		end
 		local selected_from = nil
 		local list = {}
 		if(    fields and fields.one_step_required) then