diff --git a/app/src/main/java/io/xpipe/app/core/App.java b/app/src/main/java/io/xpipe/app/core/App.java
index 2bdd815e..78535922 100644
--- a/app/src/main/java/io/xpipe/app/core/App.java
+++ b/app/src/main/java/io/xpipe/app/core/App.java
@@ -44,6 +44,15 @@ public class App extends Application {
             }
         }
 
+        if (OsType.getLocal().equals(OsType.MACOS)) {
+            Desktop.getDesktop().setAboutHandler(e -> {
+                AppLayoutModel.get().selectSettings();
+            });
+            Desktop.getDesktop().setPreferencesHandler(e -> {
+                AppLayoutModel.get().selectSettings();
+            });
+        }
+
         if (OsType.getLocal().equals(OsType.LINUX)) {
             try {
                 Toolkit xToolkit = Toolkit.getDefaultToolkit();