diff --git a/lib/OpenLayers/Popup.js b/lib/OpenLayers/Popup.js
index f844c3aae5..99816fe8dc 100644
--- a/lib/OpenLayers/Popup.js
+++ b/lib/OpenLayers/Popup.js
@@ -153,6 +153,15 @@ OpenLayers.Popup = OpenLayers.Class({
     padding: 0,
 
     /** 
+     * Property: disableFirefoxOverflowHack
+     * {Boolean} The hack for overflow in Firefox causes all elements 
+     *     to be re-drawn, which causes Flash elements to be 
+     *     re-initialized, which is troublesome.
+     *     With this property the hack can be disabled.
+     */
+    disableFirefoxOverflowHack: false,
+
+    /**
      * Method: fixPadding
      * To be removed in 3.0, this function merely helps us to deal with the 
      *     case where the user may have set an integer value for padding, 
@@ -327,7 +336,7 @@ OpenLayers.Popup = OpenLayers.Class({
         }
         
         //listen to movestart, moveend to disable overflow (FF bug)
-        if (OpenLayers.Util.getBrowserName() == 'firefox') {
+        if (!this.disableFirefoxOverflowHack && OpenLayers.Util.getBrowserName() == 'firefox') {
             this.map.events.register("movestart", this, function() {
                 var style = document.defaultView.getComputedStyle(
                     this.contentDiv, null