diff --git a/bin/focus_workspace b/bin/focus_workspace
index b9d839a..a9a8923 100755
--- a/bin/focus_workspace
+++ b/bin/focus_workspace
@@ -32,4 +32,4 @@ fi
 
 i3-msg -q "workspace number ${NEXT_WORKSPACE}"
 # Update previous file in run/
-echo -n ${CURRENT_WORKSPACE} > ~/.config/i3/run/previous_${CURRENT_OUTPUT}
+[ ${NEXT_WORKSPACE} -eq ${CURRENT_WORKSPACE} ] || echo -n ${CURRENT_WORKSPACE} > ~/.config/i3/run/previous_${CURRENT_OUTPUT}
diff --git a/config b/config
index c96fd52..9e6b6b8 100644
--- a/config
+++ b/config
@@ -46,8 +46,8 @@ bindsym $mod+j                  exec ~/.config/i3/bin/menu_workspace_switch
 bindsym $mod+space              layout toggle tabbed splith
 bindsym $mod+f                  fullscreen toggle
 # Change window focus
-bindsym $mod+Tab                focus next
-bindsym $mod+Shift+Tab          focus prev
+bindsym $mod+Tab                focus next sibling
+bindsym $mod+Shift+Tab          focus prev sibling
 bindsym $mod+Shift+Left         focus left
 bindsym $mod+Shift+Right        focus right
 bindsym $mod+Shift+Down         focus down