diff --git a/dot_config/i3/config b/dot_config/i3/config
index 3dcbaa0..0cee1e3 100644
--- a/dot_config/i3/config
+++ b/dot_config/i3/config
@@ -223,18 +223,14 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
-mode "notification" {
-	# Notifications
-	bindsym q exec dunstctl close
-	bindsym c exec dunstctl close_all
-	bindsym h exec dunstctl history
-	bindsym a exec dunstctl context
-
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-	bindsym $mod+n mode "default"
+set $mode_notification Notification (q: close, c: close_all, h: history, a: context)
+mode "$mode_notification" {
+	bindsym q mode "default", exec dunstctl close
+	bindsym c mode "default", exec dunstctl close_all
+	bindsym h mode "default", exec dunstctl history
+	bindsym a mode "default", exec dunstctl context
 }
-bindsym $mod+n mode "notification"
+bindsym $mod+n mode "$mode_notification"
 
 # Start i3bar to display a workspace bar (plus the system information i3status
 # finds out, if available)
@@ -267,8 +263,6 @@ bindsym $mod+g mode "$mode_gaps"
 mode "$mode_gaps" {
     bindsym g mode "default", gaps inner all set 10, gaps outer all set 10
     bindsym f mode "default", gaps inner all set 1, gaps outer all set 1
-#    bindsym Return mode "default"
-#    bindsym Escape mode "default"
 }
 
 # Toggle window title