diff --git a/mods/lzr_level_select/init.lua b/mods/lzr_level_select/init.lua
index 054bf76..ea5559f 100644
--- a/mods/lzr_level_select/init.lua
+++ b/mods/lzr_level_select/init.lua
@@ -7,7 +7,7 @@ local current_level_selection = nil
 lzr_level_select.open_dialog = function(player, preselect)
 	local form = "formspec_version[4]size[6,10]"..
 		"label[0.5,0.4;"..F(S("Select level:")).."]"..
-		"button_exit[1.5,8.5;3,1;okay;"..F(S("Start")).."]"..
+		"button[1.5,8.5;3,1;okay;"..F(S("Start")).."]"..
 		"textlist[0.5,0.8;5,7.5;levellist;"
 	local list = {}
 	local entry_header = ""
@@ -41,6 +41,10 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 		if fields.okay then
 			if current_level_selection then
 				lzr_levels.start_level(current_level_selection)
+				minetest.close_formspec(player:get_player_name(), "lzr_level_select:levellist")
+			else
+				current_level_selection = 1
+				lzr_level_select.open_dialog(player, true)
 			end
 		elseif fields.levellist then
 			local expl = minetest.explode_textlist_event(fields.levellist)
@@ -68,6 +72,7 @@ minetest.register_chatcommand("level", {
 			if not player then
 				return false, S("No player.")
 			end
+			current_level_selection = nil
 			lzr_level_select.open_dialog(player, false)
 			return true
 		end
diff --git a/mods/lzr_teleporter/mod.conf b/mods/lzr_teleporter/mod.conf
index de595a5..792260c 100644
--- a/mods/lzr_teleporter/mod.conf
+++ b/mods/lzr_teleporter/mod.conf
@@ -1,2 +1,2 @@
 name = lzr_teleporter
-depends = lzr_gamestate
+depends = lzr_gamestate, lzr_levels