diff --git a/core/core-keybinds.el b/core/core-keybinds.el
index 0e89a270c..be5a93ce5 100644
--- a/core/core-keybinds.el
+++ b/core/core-keybinds.el
@@ -26,9 +26,12 @@ and Emacs states, and for non-evil users.")
 ;;
 ;;; Keybind settings
 
-(when IS-MAC
-  (setq mac-command-modifier 'super
-        mac-option-modifier 'meta))
+(cond (IS-MAC
+       (setq mac-command-modifier 'super
+             mac-option-modifier  'meta))
+      (IS-WINDOWS
+       (setq w32-lwindow-modifier 'super
+             w32-rwindow-modifier 'super)))
 
 
 ;;