diff --git a/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java b/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java
index 75eb07a91..8c3529643 100644
--- a/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java
+++ b/app/src/main/java/io/xpipe/app/comp/AppLayoutComp.java
@@ -32,6 +32,7 @@ public class AppLayoutComp extends Comp<CompStructure<Pane>> {
     @Override
     public CompStructure<Pane> createBase() {
         Map<Comp<?>, ObservableValue<Boolean>> map = model.getEntries().stream()
+                .filter(entry -> entry.comp() != null)
                 .collect(Collectors.toMap(
                         entry -> entry.comp(),
                         entry -> Bindings.createBooleanBinding(
diff --git a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
index 3cafd8b11..ceb86ffd5 100644
--- a/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
+++ b/app/src/main/java/io/xpipe/app/core/AppLayoutModel.java
@@ -100,19 +100,19 @@ public class AppLayoutModel {
                 new Entry(
                         AppI18n.observable("visitGithubRepository"),
                         "mdi2g-github",
-                        new AppPrefsComp(),
+                        null,
                         () -> Hyperlinks.open(Hyperlinks.GITHUB),
                         new KeyCodeCombination(KeyCode.DIGIT3, KeyCombination.CONTROL_DOWN)),
                 new Entry(
                         AppI18n.observable("discord"),
                         "mdi2d-discord",
-                        new AppPrefsComp(),
+                        null,
                         () -> Hyperlinks.open(Hyperlinks.DISCORD),
                         new KeyCodeCombination(KeyCode.DIGIT3, KeyCombination.CONTROL_DOWN)),
                 new Entry(
                         AppI18n.observable("api"),
                         "mdi2c-code-json",
-                        new AppPrefsComp(),
+                        null,
                         () -> Hyperlinks.open(
                                 "http://localhost:" + AppBeaconServer.get().getPort()),
                         new KeyCodeCombination(KeyCode.DIGIT3, KeyCombination.CONTROL_DOWN))));