diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index a5a2a88f1..7ab875b46 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -117,6 +117,7 @@
 - **Menu** - Fix text align on `dropdown item` inside `icon menu`
 - **Menu** - Fixed hybrid initialization not creating `menu` correctly. Fixed docs example of hybrid `<select>` initialization
 - **Menu** - Fixed issue with `labeled input` text inside menu not appearing vertically centered
+- **Popup** - Fixed `onRemove` firing even when popup is not removed
 - **Reveal** - Reveal now uses `display: inherit` instead of forcing `inline-block`
 
 ### Version 2.0.8 - August 10, 2015
diff --git a/src/definitions/modules/popup.js b/src/definitions/modules/popup.js
index 3e1c00ea6..0fb18753c 100644
--- a/src/definitions/modules/popup.js
+++ b/src/definitions/modules/popup.js
@@ -342,12 +342,12 @@ $.fn.popup = function(parameters) {
         },
 
         removePopup: function() {
-          module.debug('Removing popup', $popup);
           if( module.has.popup() && !settings.popup) {
+            module.debug('Removing popup', $popup);
             $popup.remove();
             $popup = undefined;
+            settings.onRemove.call($popup, element);
           }
-          settings.onRemove.call($popup, element);
         },
 
         save: {