diff --git a/modules/macos/system.nix b/modules/macos/system.nix
index 36d4a6d65c267964a484cedbd9752e21b21726d4..4b05d586e9fc3f615eb6dbc38e20f063de937d7a 100644
--- a/modules/macos/system.nix
+++ b/modules/macos/system.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  userSettings,
+  ...
+}: {
   #Use touchid or watch to activate sudo
   security.pam.services.sudo_local = {
     enable = true;
@@ -12,7 +16,7 @@
     stateVersion = 6;
 
     defaults = {
-      # Turn quaranite off
+      # Turn quarantine off
       LaunchServices = {
         LSQuarantine = false;
       };
@@ -70,6 +74,10 @@
         ShowPathbar = true;
         FXEnableExtensionChangeWarning = false;
       };
+
+      _HIHideMenuBar = {
+        enable = userSettings.darwinTiling;
+      };
       CustomSystemPreferences = {
         "com.apple.universalaccess" = {
           closeViewTrackpadGestureZoomEnabled = 1;
diff --git a/modules/macos/tiling/aerospace.nix b/modules/macos/tiling/aerospace.nix
index 8d042d8ffd74d47cd497c1260a32762db15fef4c..ff99fbec45a91321169b1fb8e2202c2b3a410fd1 100644
--- a/modules/macos/tiling/aerospace.nix
+++ b/modules/macos/tiling/aerospace.nix
@@ -112,6 +112,15 @@
         "-c"
         "/run/current-system/sw/bin/sketchybar --trigger aerospace_workspace_change FOCUSED_WORKSPACE=$AEROSPACE_FOCUSED_WORKSPACE"
       ];
+
+      on-window-detected = [
+        #Ghostty currently renders tabs as individual processes
+        #Fix comes from https://ghostty.org/docs/help/macos-tiling-wms
+        {
+          "if".app-id = "com.mitchellh.ghostty";
+          run = ["layout tiling"];
+        }
+      ];
     };
   };
 }