diff --git a/NEG/UI/UiManager.cs b/NEG/UI/UiManager.cs
index 8e315cc..c0fb864 100644
--- a/NEG/UI/UiManager.cs
+++ b/NEG/UI/UiManager.cs
@@ -151,7 +151,7 @@ namespace NEG.UI
         {
             if (forceShow)
             {
-                if(currentShownPopup.priority <= priority)
+                if(currentShownPopup.data != null && currentShownPopup.priority >= priority)
                     return;
                 
                 popupsToShow.Enqueue(currentShownPopup.data, currentShownPopup.priority);
@@ -163,6 +163,8 @@ namespace NEG.UI
             {
                 if(!d.IsValid)
                     continue;
+                if(d == currentShownPopup.data)
+                    continue;
                 ShowPopup(d, p);
                 return;
             }