diff --git a/modalbind b/modalbind
index c4f48ef..6cba6e0 160000
--- a/modalbind
+++ b/modalbind
@@ -1 +1 @@
-Subproject commit c4f48eff3e2e57f5fe550fc1cdea377a55065fda
+Subproject commit 6cba6e0cc4b08b75125d62a1b9747b2b27218b26
diff --git a/mybindings.lua b/mybindings.lua
index 13e7f6f..075d0ac 100644
--- a/mybindings.lua
+++ b/mybindings.lua
@@ -40,7 +40,7 @@ local mpdmap = {
 	{"t", mpd.prompt.title,  "title" },
 	{"j", mpd.prompt.jump,  "jump" },
 	{"r", mpd.prompt.toggle_replace_on_search,   "toggle replacing" },
-	{"h", mb.grabf(mpdhosts, "Select MPD host"), "Change host" }
+	{"h", mb.grabf{keymap=mpdhosts, name="Select MPD host"}, "Change host" }
 }
 
 local progmap = {
@@ -76,10 +76,10 @@ local myglobalkeys = awful.util.table.join(
 
 	--{{{ Modal mappings
 
-	awful.key({ modkey            },  "m",  mb.grabf(mpdmap, "MPD", true)),
+	awful.key({ modkey            },  "m",  mb.grabf{keymap=mpdmap, name="MPD", stay_in_mode=true}),
 	--awful.key({ modkey, "Shift"   },  "m",  mb.grabf(mpdpromts, "MPD - Search for")),
-	awful.key({ modkey            },  "c",  mb.grabf(progmap, "Commands")),
-	awful.key({ modkey            },  "d",  mb.grabf(docmap, "Documents")),
+	awful.key({ modkey            },  "c",  mb.grabf{keymap=progmap, name="Commands"}),
+	awful.key({ modkey            },  "d",  mb.grabf{keymap=docmap, name="Documents"}),
 	awful.key({ modkey            },  "n",  function()
 		if naughty.is_suspended() then
 			naughty.resume()
diff --git a/rc.lua b/rc.lua
index 43526d3..8e33b3b 100644
--- a/rc.lua
+++ b/rc.lua
@@ -62,6 +62,7 @@ audiowheel = require("audiowheel")-- { bg = "#ffff00aa" }
 
 binder = require("separable.binder")
 binder.modal.set_location("bottom_left")
+binder.modal.hide_default_options()
 --binder.modal.set_x_offset(18)
 
 binder.add_default_bindings()
diff --git a/separable/binder.lua b/separable/binder.lua
index 5c75cec..93a97dc 100644
--- a/separable/binder.lua
+++ b/separable/binder.lua
@@ -126,8 +126,8 @@ local default_bindings = awful.util.table.join(
 
 	--{{{ Modal mappings
 
-	awful.key({ modkey            },  "space",  mb.grabf(layoutmap, "Layouts")),
-	awful.key({ modkey, "Control" },  "space",  mb.grabf(layoutsettings, "Layout settings", true)),
+	awful.key({ modkey            },  "space",  mb.grabf{keymap=layoutmap, name="Layouts"}),
+	awful.key({ modkey, "Control" },  "space",  mb.grabf{keymap=layoutsettings, name="Layout settings", stay_in_mode=true}),
 	--}}}
 
 	--{{{ Audio control