diff --git a/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java
index 194c8ca50..519be2ac4 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/AppOperationMode.java
@@ -331,6 +331,11 @@ public abstract class AppOperationMode {
             AppOperationMode.halt(1);
         }
 
+        if (isInShutdown()) {
+            TrackEvent.info("Received shutdown request while in shutdown. Halting ...");
+            AppOperationMode.halt(1);
+        }
+
         TrackEvent.info("Starting shutdown ...");
 
         synchronized (AppOperationMode.class) {
diff --git a/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java b/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java
index f25f1b4c9..26d63eac1 100644
--- a/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java
+++ b/app/src/main/java/io/xpipe/app/hub/category/StoreCategoryWrapper.java
@@ -13,6 +13,7 @@ import io.xpipe.app.storage.DataStoreCategory;
 import io.xpipe.app.storage.DataStoreCategoryConfig;
 import io.xpipe.app.storage.DataStoreColor;
 
+import io.xpipe.app.util.ThreadHelper;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.property.*;
@@ -122,8 +123,14 @@ public class StoreCategoryWrapper {
     }
 
     public void delete() {
+        ThreadHelper.runAsync(() -> {
+            deleteImpl();
+        });
+    }
+
+    private void deleteImpl() {
         for (var c : children.getList()) {
-            c.delete();
+            c.deleteImpl();
         }
         DataStorage.get().deleteStoreCategory(category, false, false);
     }
diff --git a/dist/changelog/24.2.md b/dist/changelog/24.2.md
index c7dc43660..4b9179d62 100644
--- a/dist/changelog/24.2.md
+++ b/dist/changelog/24.2.md
@@ -1,5 +1,11 @@
+- Fix connection launches getting stuck on some Windows systems
 - Git sync merge conflict messages will now show the respective connection names for the files
 - Connections that are named as IPv4 addresses will now sort numerically when alphabetical sorting is enabled
 - Add new buttons to force stop/kill in addition to the normal stop action for connection types that support them
 - Update post migration dialog to emphasize that the new migrated vaults should not be opened in v23.9 and older to prevent corruption issues
+- Fix category hover highlighting making it difficult to reorder them properly
+- Fix some dialog buttons flickering
+- Fix shutting down application window not responding to close events in case it got stuck
+- Fix category deletion making UI unresponsive for a while
+- Fix Warp terminal being selected by default even after it is uninstalled due to registry leftovers (Thanks to @Leo145x)
 - Fix various NullPointers