diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs
index 8d3ab02d..c666b609 100644
--- a/nix/configurations/vanadium/home/xmonad/xmonad.hs
+++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs
@@ -86,8 +86,6 @@ main = xmonad
 
               io $ do
                 putEnv "GLFW_IM_MODULE=ibus"  -- Make sure kitty knows how to talk to fcitx
-                putEnv "MOZ_USE_XINPUT2=1"    -- Force touchpad for firefox
-
                 spawn "dbus-update-activation-environment DISPLAY XAUTHORITY WAYLAND_DISPLAY"
 
           , layoutHook =
diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix
index dccb7d8a..c5666266 100644
--- a/nix/homeModules/common/firefox.nix
+++ b/nix/homeModules/common/firefox.nix
@@ -105,4 +105,8 @@ in {
       "text/html" = ["firefox.desktop"];
     };
   };
+
+  home.sessionVariables = lib.mkIf cfg.enable {
+    MOZ_USE_XINPUT2 = "1"; # Better scrolling
+  };
 }