diff --git a/setup/mac_settings.sh b/setup/mac_settings.sh
index 884be88fc71..eddf05ae672 100755
--- a/setup/mac_settings.sh
+++ b/setup/mac_settings.sh
@@ -233,9 +233,12 @@ defaults write com.apple.screencapture disable-shadow -bool true
 #                                    D o c k
 # ============================================================================ #
 
-# auto-hide dock
+# auto-hide Dock
 defaults write com.apple.dock autohide -bool true
 
+# make Dock appear on all screens - this is important so that cmd-tab window switching appears there too as it follows the Dock screen
+defaults write com.apple.dock appswitcher-all-displays -bool true
+
 # hide non-active apps
 # XXX: careful this wipes out your Dock and reversing it to false doesn't restore your Dock items
 # If you mess up your Dock it is difficult to regenerate programmatically, so I suggest you go in to Time Machine and get the ~/Library/Preferences/com.apple.dock.plist back, 'defaults import' and then killall Dock to get back your icons