Based on:
 - https://github.com/blender/blender/commit/d09b874244c8ef7385aff136acdaae6aae67ea7e
 - https://github.com/blender/blender/commit/cf9ea111bf48b500db59f800c49f88544873c4f7

diff --git intern/ghost/intern/GHOST_SystemCocoa.mm intern/ghost/intern/GHOST_SystemCocoa.mm
index 31ce5649fdf..52c53b179e1 100644
--- intern/ghost/intern/GHOST_SystemCocoa.mm
+++ intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -641,11 +641,6 @@ GHOST_TSuccess GHOST_SystemCocoa::init()
         [NSApp setDelegate:appDelegate];
       }
 
-      // AppKit provides automatic window tabbing. Blender is a single-tabbed application
-      // without a macOS tab bar, and should explicitly opt-out of this. This is also
-      // controlled by the macOS user default #NSWindowTabbingEnabled.
-      NSWindow.allowsAutomaticWindowTabbing = NO;
-
       [NSApp finishLaunching];
     }
   }
diff --git intern/ghost/intern/GHOST_WindowCocoa.mm intern/ghost/intern/GHOST_WindowCocoa.mm
index 1776b0d5ce0..81e984e39d0 100644
--- intern/ghost/intern/GHOST_WindowCocoa.mm
+++ intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -395,7 +395,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(GHOST_SystemCocoa *systemCocoa,
   [m_window setAcceptsMouseMovedEvents:YES];
 
   NSView *contentview = [m_window contentView];
-  [contentview setAllowedTouchTypes:(NSTouchTypeMaskDirect | NSTouchTypeMaskIndirect)];
+  [contentview setAcceptsTouchEvents:YES];
 
   [m_window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
                                                               NSStringPboardType,