diff --git a/i3/config.m4 b/i3/config.m4
index 7cd48da..2abc8ff 100644
--- a/i3/config.m4
+++ b/i3/config.m4
@@ -14,6 +14,8 @@ font pango:monospace 7
 new_window none
 hide_edge_borders both
 
+focus_on_window_activation urgent
+
 floating_modifier $mod
 
 bindsym $mod+Return exec gnome-terminal
@@ -45,7 +47,7 @@ bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
 bindsym $mod+Shift+space floating toggle
-bindsym $mod+space focus mode_toggle
+bindsym $mod+Ctrl+space focus mode_toggle
 
 bindsym $mod+a focus parent
 bindsym $mod+b focus child