diff --git a/static/plugin_dbui/CHANGELOG b/static/plugin_dbui/CHANGELOG
index 1d12c079384707509dc1fc59eb0c241687ccbe93..f16f450c2b69fa75a7417a7e1a35c9cec97c3c47 100644
--- a/static/plugin_dbui/CHANGELOG
+++ b/static/plugin_dbui/CHANGELOG
@@ -1,7 +1,8 @@
 --------------------------------- CHANGE LOG ----------------------------------
 
 HEAD
-   - Add the plugin App.grid.plugin.Export
+   - Add the plugin App.grid.plugin.Export.
+   - Mask the whole viewport during loading a PanelWithUrlSelector.
 
 0.6.1.7 (Sep 2014)
    - Use inline script and Ext.grid.Panel to display software versions
diff --git a/static/plugin_dbui/src/panel/WithUrlSelector.js b/static/plugin_dbui/src/panel/WithUrlSelector.js
index 9f43045f91d9012664e754fa8eb9a6b07a5e57c5..b3d61d4c92631ed6e8c22fc8f2fab35964f7f69c 100644
--- a/static/plugin_dbui/src/panel/WithUrlSelector.js
+++ b/static/plugin_dbui/src/panel/WithUrlSelector.js
@@ -199,12 +199,12 @@ Ext.define('App.panel.WithUrlSelector', {
 
         // load the HTML content in the main panel
         // use the main panel loader
-        // mask the whole widget including the selector
+        // mask the whole viewport
         if (!request.ext || request.ext.indexOf('htm') !== -1) {
 
             mask = {
                 msg: this.textLoad,
-                target: this
+                target: this.up('xviewport')
             };
 
             this.mainPanel.getLoader().load({