diff --git a/data/00_org.gnome.shell.extensions.classic.gschema.override b/data/00_org.gnome.shell.extensions.classic.gschema.override
index be8cdb73..c6701074 100644
--- a/data/00_org.gnome.shell.extensions.classic.gschema.override
+++ b/data/00_org.gnome.shell.extensions.classic.gschema.override
@@ -3,3 +3,7 @@ dynamic-workspaces=false
 
 [org.gnome.desktop.wm.preferences:GNOME-Classic]
 button-layout='appmenu:minimize,maximize,close'
+
+[org.gnome.desktop.wm.keybindings:GNOME-Classic]
+switch-applications=[]
+switch-windows=['<Super>Tab','<Alt>Tab']
diff --git a/meson.build b/meson.build
index 3ae3a9b4..a7a1de4e 100644
--- a/meson.build
+++ b/meson.build
@@ -34,7 +34,6 @@ endif
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
 
 classic_extensions = [
-  'alternate-tab',
   'apps-menu',
   'places-menu',
   'launch-new-instance',
@@ -43,6 +42,7 @@ classic_extensions = [
 
 default_extensions = classic_extensions
 default_extensions += [
+  'alternate-tab',
   'drive-menu',
   'screenshot-window-sizer',
   'windowsNavigator',