diff --git a/modules/home/apps/default.nix b/modules/home/apps/default.nix
index a228a3a..1428226 100644
--- a/modules/home/apps/default.nix
+++ b/modules/home/apps/default.nix
@@ -11,7 +11,24 @@
       [
         vesktop
         zulip
-        mailspring
+
+        #needed to make sure it launches with the lib-secret stuff
+        (pkgs.mailspring.overrideAttrs (oldAttrs: {
+          desktopItems = [
+            (pkgs.makeDesktopItem {
+              name = "mailspring";
+              exec = "mailspring --password-store=\"gnome-libsecret\" %U";
+              comment = "Mailspring Email Client";
+              desktopName = "Mailspring";
+              categories = [
+                "Office"
+                "Network"
+                "Email"
+              ];
+            })
+          ];
+        }))
+
         zathura
       ]
     else
diff --git a/modules/home/wm/hyprland/hyprland.lua b/modules/home/wm/hyprland/hyprland.lua
index 0944a30..27f82d9 100644
--- a/modules/home/wm/hyprland/hyprland.lua
+++ b/modules/home/wm/hyprland/hyprland.lua
@@ -177,11 +177,13 @@ hl.bind(mainMod .. " + CTRL + down", hl.dsp.window.move({ direction = "down" }))
 hl.bind(mainMod .. " + CTRL + up", hl.dsp.window.move({ direction = "up" }))
 
 -- niri's "focus/move-window-or-workspace" fallback variants: Hyprland has no
--- auto-fallback-to-workspace, so these alias to the plain window focus/move.
-hl.bind(mainMod .. " + J", hl.dsp.focus({ direction = "down" }))
-hl.bind(mainMod .. " + K", hl.dsp.focus({ direction = "up" }))
-hl.bind(mainMod .. " + CTRL + J", hl.dsp.window.move({ direction = "down" }))
-hl.bind(mainMod .. " + CTRL + K", hl.dsp.window.move({ direction = "up" }))
+-- auto-fallback-to-workspace, so J/K are bound to workspace switching (like
+-- Page_Down/Page_Up below) rather than window focus, which is redundant with
+-- the plain arrow keys above.
+hl.bind(mainMod .. " + J", hl.dsp.focus({ workspace = "+1" }))
+hl.bind(mainMod .. " + K", hl.dsp.focus({ workspace = "-1" }))
+hl.bind(mainMod .. " + CTRL + J", hl.dsp.window.move({ workspace = "+1", follow = true }))
+hl.bind(mainMod .. " + CTRL + K", hl.dsp.window.move({ workspace = "-1", follow = true }))
 
 -- niri: focus/move-column-first/last -> approximated with a full view fit
 hl.bind(mainMod .. " + Home", hl.dsp.layout("fit tobeg"))