diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js
index 7e410e3ce..006e48d3b 100644
--- a/src/definitions/modules/popup.js
+++ b/src/definitions/modules/popup.js
@@ -311,7 +311,9 @@ $.fn.popup = function(parameters) {
         removePopup: function() {
           module.debug('Removing popup');
           $.proxy(settings.onRemove, $popup)(element);
-          $popup.remove();
+          if($popup.size() > 0) {
+            $popup.remove();
+          }
         },
 
         save: {