diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
index ff7a0347d8..cee7a2c7b1 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
+++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/browser/DataBrowserDlg.java
@@ -993,6 +993,7 @@ public class DataBrowserDlg extends CaveSWTDialog implements IDataTableUpdate,
                             return;
                         }
                     }
+                    loadSaveDlg = null;
                 }
             });
 
diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/LoadSaveConfigDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/LoadSaveConfigDlg.java
index d03f9e38ae..a78487fd1e 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/LoadSaveConfigDlg.java
+++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/LoadSaveConfigDlg.java
@@ -202,7 +202,7 @@ public class LoadSaveConfigDlg extends CaveSWTDialog {
     public LoadSaveConfigDlg(Shell parent, DialogType type,
             String fileNamePath, String excludedNameForSaving,
             boolean showPreview) {
-        super(parent, SWT.TITLE, CAVE.DO_NOT_BLOCK);
+        super(parent, SWT.TITLE | SWT.APPLICATION_MODAL, CAVE.DO_NOT_BLOCK);
 
         if (type == DialogType.OPEN) {
             setText("Load Configuration");
diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/FindDlg.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/FindDlg.java
index fdfb7b9641..1ff9d1b8e8 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/FindDlg.java
+++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/notification/FindDlg.java
@@ -148,7 +148,7 @@ public class FindDlg extends CaveSWTDialog {
     public FindDlg(Shell parent,
             TableDataManager<NotificationRowData> filteredTableList,
             int sIndex, int eIndex, int selected, ITableFind callback) {
-        super(parent, SWT.DIALOG_TRIM, CAVE.NONE);
+        super(parent, SWT.DIALOG_TRIM, CAVE.NONE | CAVE.DO_NOT_BLOCK);
         this.setText("Find");
 
         this.filteredTableList = filteredTableList;