diff --git a/external/ImGui/source/imgui.cpp b/external/ImGui/source/imgui.cpp
index 0413722a8..785c584f6 100644
--- a/external/ImGui/source/imgui.cpp
+++ b/external/ImGui/source/imgui.cpp
@@ -6730,8 +6730,9 @@ bool ImGui::Begin(const char* name, bool* p_open, ImGuiWindowFlags flags)
                 if (window == window->RootWindow)
                 {
                     ImGuiWindow* blocking_modal = FindBlockingModal(window);
-                    IM_ASSERT(blocking_modal != NULL);
-                    BringWindowToDisplayBehind(window, blocking_modal);
+
+                    if (blocking_modal != NULL)
+                        BringWindowToDisplayBehind(window, blocking_modal);
                 }
             }
         }
diff --git a/source/init/tasks.cpp b/source/init/tasks.cpp
index 561bc31a8..0dc712224 100644
--- a/source/init/tasks.cpp
+++ b/source/init/tasks.cpp
@@ -194,10 +194,14 @@ namespace hex::init {
         SharedData::footerItems.clear();
         SharedData::toolbarItems.clear();
 
+        SharedData::globalShortcuts.clear();
+        SharedData::runningTasks.clear();
+
         SharedData::dataProcessorNodes.clear();
 
         SharedData::recentFilePaths.clear();
 
+
         SharedData::clearVariables();
 
         return true;