diff --git a/i3/config b/i3/config
index 8c61d42..c2e890e 100644
--- a/i3/config
+++ b/i3/config
@@ -165,7 +165,7 @@ bindsym $mod+d exec "$launcher"
 set $mpc /usr/bin/mpc
 set $mpdmode "local mpd: [ ] play/pause, [k/j] prev/next, [h/l] rwnd/ffwd, [u/d] vol, [enter] open client"
 mode $mpdmode {
-	bindsym space     exec --no-startup-id $mpc toggle
+	bindsym space     exec --no-startup-id $mpc toggle, mode "default"
 	bindsym j         exec --no-startup-id $mpc next
 	bindsym k         exec --no-startup-id $mpc cdprev
 	bindsym h         exec --no-startup-id $mpc seek -5
diff --git a/sway/config b/sway/config
index 5f5b482..1667969 100644
--- a/sway/config
+++ b/sway/config
@@ -334,6 +334,9 @@ mode "resize" {
 }
 bindsym $mod+r mode "resize"
 
+#
+# MPD:
+#
 bindsym --locked XF86AudioPlay exec "mpc toggle"
 bindsym --locked XF86AudioPrev exec "mpc cdprev"
 bindsym --locked XF86AudioNext exec "mpc next"
@@ -341,6 +344,31 @@ bindsym --locked XF86AudioLowerVolume nop
 bindsym --locked XF86AudioRaiseVolume nop
 bindsym --locked XF86AudioMute nop
 
+set $mpc /usr/bin/mpc
+set $mpdmode "local mpd: [ ] play/pause, [k/j] prev/next, [h/l] rwnd/ffwd, [u/d] vol, [enter] open client"
+set $mpdclient $term -e ncmpcpp
+mode $mpdmode {
+	bindsym space     exec --no-startup-id $mpc toggle, mode default
+	bindsym j         exec --no-startup-id $mpc next
+	bindsym k         exec --no-startup-id $mpc cdprev
+	bindsym h         exec --no-startup-id $mpc seek -5
+	bindsym l         exec --no-startup-id $mpc seek +5
+	bindsym Backspace exec --no-startup-id $mpc seek 0%
+	bindsym u         exec --no-startup-id $mpc volume +$volumeStep
+	bindsym d         exec --no-startup-id $mpc volume -$volumeStep
+	bindsym s         exec --no-startup-id $mpc stop, mode "default"
+	bindsym Return    exec $mpdclient, mode "default"
+	bindsym KP_Enter  exec $mpdclient, mode "default"
+	bindsym o         exec $mpdclient, mode "default"
+
+	# back to normal: Escape or mod+m
+	bindsym Escape   mode "default"
+	bindsym $mod+m   mode "default"
+}
+bindsym $mod+m mode $mpdmode
+
+# ---
+
 bindsym Print exec grim -g "$(slurp)" "/tmp/screenshot-$(date +%Y-%m-%d_%H-%M-%S).png"
 
 for_window [title="^Firefox — Sharing Indicator$"] {