diff --git a/Assets/UI/Popups/techciviccompletedpopup.lua b/Assets/UI/Popups/techciviccompletedpopup.lua
index 11eb7c01..9b84d900 100644
--- a/Assets/UI/Popups/techciviccompletedpopup.lua
+++ b/Assets/UI/Popups/techciviccompletedpopup.lua
@@ -301,7 +301,9 @@ function RealizeNextPopup()
   end
 
   if not CQUI_TechPopupVisual then
-    Close();
+    m_kPopupData = {};
+    m_kCurrentData = nil;
+    UIManager:DequeuePopup(ContextPtr);
   end
 
   RefreshSize();
diff --git a/Assets/UI/worldinput.lua b/Assets/UI/worldinput.lua
index c8bf881e..a58a718a 100644
--- a/Assets/UI/worldinput.lua
+++ b/Assets/UI/worldinput.lua
@@ -425,7 +425,6 @@ function StartDragMap()
   m_dragStartWorldX, m_dragStartWorldY      = UI.GetWorldFromNormalizedScreenPos_NoWrap( dragStartX, dragStartY );
   m_dragX = dragStartX;
   m_dragY = dragStartY;
-  LuaEvents.CQUI_StartDragMap();
 end
 
 -- ===========================================================================
@@ -448,6 +447,8 @@ function UpdateDragMap()
     return;
   end
 
+  LuaEvents.CQUI_StartDragMap();
+
   if m_isALTDown then
     UI.SpinMap( m_dragStartX - x, m_dragStartY - y  );
   else