diff --git a/modalbind b/modalbind
index bda8241..efb1124 160000
--- a/modalbind
+++ b/modalbind
@@ -1 +1 @@
-Subproject commit bda8241754d6372ca39c9112eb1c187ea30b10d3
+Subproject commit efb1124bc1b128956ac5d38f215e7348f785b071
diff --git a/mybindings.lua b/mybindings.lua
index 5bdc892..3c02b9c 100644
--- a/mybindings.lua
+++ b/mybindings.lua
@@ -31,14 +31,15 @@ local mpdmap = {
 	{"N", mpd.ctrl.prev,                     "Prev" },
 	{"s", binder.spawn("mpd"),               "start MPD" },
 	{"S", binder.spawn("mpd --kill"),        "kill MPD" },
-	{"g", binder.spawn(conf.cmd.mpd_client), "Gmpc" },
+	{"g", binder.spawn(conf.cmd.mpd_client), "Gmpc", stay_in_mode=false },
 	{"separator", "Search" },
 	{"a", mpd.prompt.artist, "artist" },
 	{"b", mpd.prompt.album,  "album" },
 	{"t", mpd.prompt.title,  "title" },
 	{"j", mpd.prompt.jump,  "jump" },
 	{"r", mpd.prompt.toggle_replace_on_search,   "toggle replacing" },
-	{"h", mb.grabf{keymap=mpdhosts, name="Select MPD host"}, "Change host" }
+	{"h", mb.grabf{keymap=mpdhosts, name="Select MPD host"},
+		"Change host", stay_in_mode=false }
 }
 local mprismap = {
 	{"m", binder.spawn("playerctl play-pause"), "Toggle" },