diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java
index 1589df801..68df63ab9 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryListComp.java
@@ -25,7 +25,7 @@ public class StoreEntryListComp extends SimpleComp {
                             return new HorizontalComp(List.of(Comp.hspacer(8), custom, Comp.hspacer(10)))
                                     .styleClass("top");
                         })
-                .apply(struc -> ((Region) struc.get().getContent()).setPadding(new Insets(10, 0, 10, 0)));
+                .apply(struc -> ((Region) struc.get().getContent()).setPadding(new Insets(8, 0, 8, 0)));
         return content.styleClass("store-list-comp");
     }
 
diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java b/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java
index 0a5dfa0bb..eaee1666a 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreQuickAccessButtonComp.java
@@ -80,12 +80,12 @@ public class StoreQuickAccessButtonComp extends Comp<CompStructure<Button>> {
     public CompStructure<Button> createBase() {
         var button = new IconButtonComp("mdi2c-chevron-double-right");
         button.apply(struc -> {
-            var cm = createMenu();
-            if (cm == null) {
-                return;
-            }
-
             struc.get().setOnAction(event -> {
+                var cm = createMenu();
+                if (cm == null) {
+                    return;
+                }
+
                 ContextMenuHelper.toggleShow(cm, struc.get(), Side.RIGHT);
                 event.consume();
             });
diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
index 9b20fb49d..0fc60d051 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
@@ -28,6 +28,7 @@ import lombok.Value;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.*;
+import java.util.stream.Stream;
 
 public class AppPrefs {
 
@@ -137,21 +138,22 @@ public class AppPrefs {
     private AppPrefsStorageHandler vaultStorageHandler;
 
     private AppPrefs() {
-        this.categories = List.of(
+        this.categories = Stream.of(
                 new AboutCategory(),
                 new SystemCategory(),
                 new AppearanceCategory(),
                 new SyncCategory(),
                 new VaultCategory(),
                 new PasswordManagerCategory(),
-                new SecurityCategory(),
                 new TerminalCategory(),
                 new EditorCategory(),
                 new RdpCategory(),
                 new SshCategory(),
                 new LocalShellCategory(),
+                new SecurityCategory(),
                 new TroubleshootCategory(),
-                new DeveloperCategory());
+                new DeveloperCategory())
+                .filter(appPrefsCategory -> appPrefsCategory.show()).toList();
         var selected = AppCache.get("selectedPrefsCategory", Integer.class, () -> 0);
         if (selected == null) {
             selected = 0;
diff --git a/app/src/main/java/io/xpipe/app/prefs/AppPrefsCategory.java b/app/src/main/java/io/xpipe/app/prefs/AppPrefsCategory.java
index 03696a991..9705ea643 100644
--- a/app/src/main/java/io/xpipe/app/prefs/AppPrefsCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/AppPrefsCategory.java
@@ -4,6 +4,10 @@ import io.xpipe.app.fxcomps.Comp;
 
 public abstract class AppPrefsCategory {
 
+    protected boolean show() {
+        return true;
+    }
+
     protected abstract String getId();
 
     protected abstract Comp<?> create();
diff --git a/app/src/main/java/io/xpipe/app/prefs/SshCategory.java b/app/src/main/java/io/xpipe/app/prefs/SshCategory.java
index ccd40c326..52e345879 100644
--- a/app/src/main/java/io/xpipe/app/prefs/SshCategory.java
+++ b/app/src/main/java/io/xpipe/app/prefs/SshCategory.java
@@ -4,10 +4,13 @@ import io.xpipe.app.fxcomps.Comp;
 import io.xpipe.app.util.OptionsBuilder;
 import io.xpipe.core.process.OsType;
 
-import javafx.beans.property.SimpleBooleanProperty;
-
 public class SshCategory extends AppPrefsCategory {
 
+    @Override
+    protected boolean show() {
+        return OsType.getLocal().equals(OsType.WINDOWS);
+    }
+
     @Override
     protected String getId() {
         return "ssh";
@@ -21,9 +24,7 @@ public class SshCategory extends AppPrefsCategory {
                 .sub(new OptionsBuilder()
                         .nameAndDescription("useBundledTools")
                         .addToggle(prefs.useBundledTools)
-                        .hide(new SimpleBooleanProperty(!OsType.getLocal().equals(OsType.WINDOWS)))
-                        .addComp(prefs.getCustomComp("x11WslInstance"))
-                        .hide(new SimpleBooleanProperty(!OsType.getLocal().equals(OsType.WINDOWS))))
+                        .addComp(prefs.getCustomComp("x11WslInstance")))
                 .buildComp();
     }
 }