diff --git a/source/Ox.UI/js/Window/Dialog.js b/source/Ox.UI/js/Window/Dialog.js
index 51151d9b..9f527910 100644
--- a/source/Ox.UI/js/Window/Dialog.js
+++ b/source/Ox.UI/js/Window/Dialog.js
@@ -66,7 +66,7 @@ Ox.Dialog = function(options, self) {
                 }
             })
             .hide()
-            .appendTo(Ox.UI.$body);
+            .appendTo(Ox.$body);
 
     self.hasButtons = !!self.options.buttons.length;
     self.barsHeight = 24 + 24 * self.hasButtons;
@@ -254,10 +254,7 @@ Ox.Dialog = function(options, self) {
                 self.drag.top - self.drag.y + event.clientY,
                 self.minTop, self.maxTop
             );
-            setCSS({
-                left: left,
-                top: top
-            });
+            setCSS({left: left, top: top});
         }
     }
 
@@ -350,7 +347,7 @@ Ox.Dialog = function(options, self) {
     }
 
     function resize(event) {
-        var ratio = self.drag.width / self.drag.height, horizontal, vertical;
+        var horizontal, vertical, offset, ratio = self.drag.width / self.drag.height;
         if (!self.drag.fixedRatio && event.shiftKey) {
             self.drag.centerX = Math.round(self.drag.left + self.drag.width / 2);
             self.drag.centerY = Math.round(self.drag.top + self.drag.height / 2);
@@ -491,7 +488,7 @@ Ox.Dialog = function(options, self) {
                 width: self.options.width
             } : {}));
         }
-        var offset = that.offset();
+        offset = that.offset();
         self.drag.left = offset.left;
         self.drag.top = offset.top;
         self.drag.width = self.options.width;
@@ -512,6 +509,27 @@ Ox.Dialog = function(options, self) {
         });
     }
 
+    function resizeWindow() {
+        Ox.print('RESIZE WINDOW')
+        self.options.width = Math.min(self.options.width, window.innerWidth);
+        self.options.height = Math.min(self.options.height, window.innerHeight - self.barsHeight);
+        var offset = that.offset();
+        setMinAndMax();
+        if (self.centered) {
+            center();
+        } else if (self.maximized) {
+            self.maximized = false;
+            maximize();
+        } else {
+            setCSS({
+                left: Math.min(offset.left, self.maxLeft),
+                top: Math.min(offset.top, self.maxTop),
+                width: self.options.width,
+                height: self.options.height
+            });
+        }
+    }
+
     function setButtons() {
         var buttonsLeft,
             buttonsRight,
@@ -568,6 +586,7 @@ Ox.Dialog = function(options, self) {
     }
 
     function setCSS(css, animate) {
+        Ox.print('DIALOG SET CSS', css)
         var ms = animate ? 100 : 0,
             offset = that.offset(),
             triggerEvent = self.isOpen && (
@@ -621,7 +640,6 @@ Ox.Dialog = function(options, self) {
                 self.options.minHeight = Math.round(self.options.minWidth / ratio);
             }
         }
-        Ox.Log('Window', 'sMM', self, window.innerHeight, maxRatio)
     }
 
     /*@
@@ -646,6 +664,7 @@ Ox.Dialog = function(options, self) {
                 self.$layer.hide();
                 that.loseFocus();
             }
+            Ox.$window.off({resize: resizeWindow});
             that.triggerEvent('close');
             self.options.removeOnClose && that.remove();
         }
@@ -711,20 +730,7 @@ Ox.Dialog = function(options, self) {
                 self.$layer.show();
                 that.gainFocus();
             }
-            Ox.UI.$window.on({
-                resize: function() {
-                    var offset = that.offset();
-                    setMinAndMax();
-                    if (self.centered) {
-                        center();
-                    } else {
-                        that.css({
-                            left: Math.min(offset.left, self.maxLeft) + 'px',
-                            top: Math.min(offset.top, self.maxTop) + 'px'
-                        });
-                    }
-                }
-            });
+            Ox.$window.on({resize: resizeWindow});
             that.triggerEvent('open');
         }
         return that;