diff --git a/modules/darwin/karabiner.nix b/modules/darwin/karabiner.nix
index 15b8fee..d049aaa 100644
--- a/modules/darwin/karabiner.nix
+++ b/modules/darwin/karabiner.nix
@@ -87,13 +87,30 @@ let
       #   manipulators = manipulators;
       # }
       {
-        description = "Hyperkey";
+        description = "Caps Lock to Escape";
         manipulators = [
           {
             from = {
               key_code = "caps_lock";
               modifiers = { optional = [ "any" ]; };
             };
+            to = [
+              {
+                key_code = "escape";
+              }
+            ];
+            type = "basic";
+          }
+        ];
+      }
+      {
+        description = "Escape to Hyperkey";
+        manipulators = [
+          {
+            from = {
+              key_code = "escape";
+              modifiers = { optional = [ "any" ]; };
+            };
             to = [
               {
                 key_code = "left_shift";
@@ -104,11 +121,6 @@ let
                 ];
               }
             ];
-            to_if_alone = [
-              {
-                key_code = "escape";
-              }
-            ];
             type = "basic";
           }
         ];