diff --git a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
index 7bdaa55ea..e4b8b9f11 100644
--- a/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
+++ b/app/src/main/java/io/xpipe/app/util/ContextMenuHelper.java
@@ -30,7 +30,10 @@ public class ContextMenuHelper {
             Platform.runLater(() -> {
                 var first = contextMenu.getItems().getFirst();
                 if (first != null) {
-                    first.getStyleableNode().requestFocus();
+                    var s = first.getStyleableNode();
+                    if (s != null) {
+                        s.requestFocus();
+                    }
                 }
             });
         });
diff --git a/dist/changelogs/15.2_incremental.md b/dist/changelogs/15.2_incremental.md
index 560f73cc5..22040be68 100644
--- a/dist/changelogs/15.2_incremental.md
+++ b/dist/changelogs/15.2_incremental.md
@@ -3,6 +3,8 @@
 - Add support for cosmic-term of the new cosmic desktop environment
 - Update homepage and documentation page. There's now much more content at [https://docs.xpipe.io](https://docs.xpipe.io)
 - Fix terminal restart failing with a wrong secret message
+- Fix ssh failing on some Windows systems when userprofile contained special characters
+- Fix script context menu in hub description being misleading when compatibility could not be determined
 - Fix git sync opening a lot of empty windows on Windows in some cases
 - Fix git sync test failing with no clear message when git wasn't installed
 - Fix podman container state being wrong on refresh
diff --git a/version b/version
index c977667b8..dafb659a6 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-15.2-4
+15.2