diff --git a/external/ImGui/include/imgui_memory_editor.h b/external/ImGui/include/imgui_memory_editor.h
index 01ce20c73..7de1d9207 100644
--- a/external/ImGui/include/imgui_memory_editor.h
+++ b/external/ImGui/include/imgui_memory_editor.h
@@ -612,7 +612,7 @@ struct MemoryEditor
                 ImGui::BeginChild("##scrolling");
                 ImGui::SetScrollFromPosY(ImGui::GetCursorStartPos().y + (GotoAddr / Cols) * ImGui::GetTextLineHeight());
                 ImGui::EndChild();
-                DataEditingAddr = DataPreviewAddr = GotoAddr;
+                DataEditingAddr = DataPreviewAddr = DataPreviewAddrEnd = GotoAddr;
                 DataEditingTakeFocus = true;
             }
             GotoAddr = (size_t)-1;
diff --git a/source/views/view_hexeditor.cpp b/source/views/view_hexeditor.cpp
index f11f0a8a1..3bf2a143b 100644
--- a/source/views/view_hexeditor.cpp
+++ b/source/views/view_hexeditor.cpp
@@ -478,13 +478,13 @@ namespace hex {
             saveAs();
             return true;
         } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_F) {
-            ImGui::OpenPopup("Search");
+            View::doLater([]{ ImGui::OpenPopup("Search"); });
             return true;
         } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_G) {
-            ImGui::OpenPopup("Goto");
+            View::doLater([]{ ImGui::OpenPopup("Goto"); });
             return true;
         } else if (mods == GLFW_MOD_CONTROL && key == GLFW_KEY_O) {
-            ImGui::OpenPopup("Open File");
+            View::doLater([]{ ImGui::OpenPopup("Open File"); });
             return true;
         } else if (mods == (GLFW_MOD_CONTROL | GLFW_MOD_ALT) && key == GLFW_KEY_C) {
             this->copyBytes();
@@ -915,7 +915,7 @@ R"(
             }
         };
 
-        if (ImGui::BeginPopup("Search")) {
+        if (ImGui::BeginPopupContextVoid("Search")) {
             ImGui::TextUnformatted("Search");
             if (ImGui::BeginTabBar("searchTabs")) {
                 char *currBuffer;