diff --git a/flake.lock b/flake.lock
index 6f6d2b8..d175a16 100644
--- a/flake.lock
+++ b/flake.lock
@@ -419,15 +419,15 @@
         "zon2nix": "zon2nix"
       },
       "locked": {
-        "lastModified": 1785080636,
-        "narHash": "sha256-ACiF5qaL4yiLSMesIPi4+4Aftw5QiMSR2qzp+5hlMvo=",
-        "owner": "moons-14",
+        "lastModified": 1785726460,
+        "narHash": "sha256-pvbS2/rhIJbkq0QqyVwRertdPp2JIu44IRF5C71Iea8=",
+        "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "f11e5199a6bd2a2e1a536d3c225a7d9a39827ea4",
+        "rev": "b4592eefd27290457852ad7d4f16799ecc00b983",
         "type": "github"
       },
       "original": {
-        "owner": "moons-14",
+        "owner": "ghostty-org",
         "repo": "ghostty",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 3acd593..83759f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,7 +35,7 @@
 
     # Terminal
     ghostty = {
-      url = "github:moons-14/ghostty";
+      url = "github:ghostty-org/ghostty";
     };
 
     # Shell / Launcher
diff --git a/modules/applications/ghostty/home/common.nix b/modules/applications/ghostty/home/common.nix
index bbcb3ef..a82ff16 100644
--- a/modules/applications/ghostty/home/common.nix
+++ b/modules/applications/ghostty/home/common.nix
@@ -23,6 +23,7 @@ _: {
         "ctrl+shift+minus=decrease_font_size:1"
       ];
 
+      quick-terminal-screen = "mouse";
       quick-terminal-position = "top";
       quick-terminal-size = "98%,100%";
       quick-terminal-autohide = false;
diff --git a/modules/applications/ghostty/home/nixos.nix b/modules/applications/ghostty/home/nixos.nix
index a5d47a4..d2b54cb 100644
--- a/modules/applications/ghostty/home/nixos.nix
+++ b/modules/applications/ghostty/home/nixos.nix
@@ -1,6 +1,6 @@
-{ inputs, pkgs, ... }: {
+{ inputs, system, ... }: {
   programs.ghostty = {
     systemd.enable = true;
-    package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.ghostty-releasefast;
+    package = inputs.ghostty.packages.${system}.default;
   };
 }