diff --git a/home/christoph/nixinator/default.nix b/home/christoph/nixinator/default.nix
index 3a8e0214..ddd1f445 100644
--- a/home/christoph/nixinator/default.nix
+++ b/home/christoph/nixinator/default.nix
@@ -121,6 +121,7 @@
         # jetbrains.rider
         zed-editor
         vscode
+        ghidra # launch with _JAVA_AWT_WM_NONREPARENTING=1
 
         # Unity Stuff
         # unityhub
diff --git a/home/homemodules/fish/default.nix b/home/homemodules/fish/default.nix
index 027ea86a..881c1ed9 100644
--- a/home/homemodules/fish/default.nix
+++ b/home/homemodules/fish/default.nix
@@ -157,6 +157,10 @@ in {
             storage = "gdu";
           })
 
+          (abbrify pkgs.ghidra {
+            ghidra = "_JAVA_AWT_WM_NONREPARENTING=1 ghidra";
+          })
+
           (abbrify pkgs.git {
             gs = "git status";
             gd = "git diff --output-indicator-new=' ' --output-indicator-old=' '";