diff --git a/src/modules/popup.js b/src/modules/popup.js
index ed27ebc42..a609457ef 100755
--- a/src/modules/popup.js
+++ b/src/modules/popup.js
@@ -492,6 +492,7 @@ $.fn.popup = function(parameters) {
               .css(positioning)
               .removeClass(className.position)
               .addClass(position)
+              .addClass(className.loading)
             ;
             // check if is offstage
             offstagePosition = module.get.offstagePosition();
@@ -508,6 +509,7 @@ $.fn.popup = function(parameters) {
               else {
                 module.error(error.recursion);
                 searchDepth = 0;
+                module.reset();
                 return false;
               }
             }
@@ -516,6 +518,8 @@ $.fn.popup = function(parameters) {
               searchDepth = 0;
               return true;
             }
+
+            $module.removeClass(className.loading);
           }
 
         },
diff --git a/src/modules/popup.less b/src/modules/popup.less
index 1e82fcab4..836d87eba 100755
--- a/src/modules/popup.less
+++ b/src/modules/popup.less
@@ -207,7 +207,8 @@
   display: block;
   visibility: hidden;
 }
-.ui.active.popup {
+
+.ui.visible.popup {
   display: block;
 }