diff --git a/src/windows/windows.es6 b/src/windows/windows.es6
index 692d06356a..b5bd24cfd0 100644
--- a/src/windows/windows.es6
+++ b/src/windows/windows.es6
@@ -340,6 +340,14 @@ export const createBlankWindow = function($html,options) {
       }
    });
 
+   dialog.bind('dialogextendmaximize', () => {
+      dialog.css({ zIndex: 99999 });
+   });
+   dialog.bind('dialogextendrestore', () => {
+      dialog.css({ zIndex: 100 });
+      dialog.draggable('option', 'containment', false);
+   })
+
    if(options.destroy) { /* register for destroy event which have been patched */
       blankWindow.on('dialogdestroy', options.destroy);
    }