diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
index 301f8e8af2..b5439a4bdc 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/MissingImageDialog.java
@@ -30,6 +30,7 @@ import javax.swing.JFileChooser;
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.datamodel.SleuthkitCase;
 import org.sleuthkit.datamodel.TskCoreException;
@@ -52,7 +53,7 @@ class MissingImageDialog extends javax.swing.JDialog {
     private JFileChooser fc = new JFileChooser();
 
     private MissingImageDialog(long obj_id, SleuthkitCase db) {
-        super(new JFrame(), true);
+        super((JFrame) WindowManager.getDefault().getMainWindow(), true);
         this.obj_id = obj_id;
         this.db = db;
         initComponents();
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java
index 9dd6ab12ba..d105f3b2e0 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationCleanDialog.java
@@ -9,6 +9,7 @@ import java.awt.Dimension;
 import java.awt.Toolkit;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import org.openide.windows.WindowManager;
 
 /**
  * Displays a panel in a new clean dialog. A clean dialog contains nothing but
@@ -28,7 +29,7 @@ public class AdvancedConfigurationCleanDialog extends javax.swing.JDialog {
      * Creates new form AdvancedConfigurationDialog
      */
     public AdvancedConfigurationCleanDialog(boolean resizable) {
-        super(new JFrame(), true);
+        super((JFrame) WindowManager.getDefault().getMainWindow(), true);
         setResizable(resizable);
         if (resizable) {
             this.setIconImage(null);
diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java
index f050d05c5b..8bcfd81308 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/AdvancedConfigurationDialog.java
@@ -30,6 +30,7 @@ import java.awt.Toolkit;
 import java.awt.event.ActionListener;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import org.openide.windows.WindowManager;
 
 /**
  *
@@ -48,7 +49,7 @@ public class AdvancedConfigurationDialog extends javax.swing.JDialog {
      * Creates new form AdvancedConfigurationDialog
      */
     public AdvancedConfigurationDialog(boolean resizable) {
-        super(new JFrame(), true);
+        super((JFrame) WindowManager.getDefault().getMainWindow(), true);
         setResizable(resizable);
         if (resizable) {
             this.setIconImage(null);
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseDialog.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseDialog.java
index 05a995b69f..40db15718f 100755
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/AddHashValuesToDatabaseDialog.java
@@ -30,6 +30,7 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.SwingUtilities;
 import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.modules.hashdatabase.HashDbManager.HashDb;
 import org.sleuthkit.datamodel.HashEntry;
 
@@ -49,7 +50,7 @@ public class AddHashValuesToDatabaseDialog extends javax.swing.JDialog {
      * database.
      */
     AddHashValuesToDatabaseDialog(HashDb hashDb) {
-        super(new JFrame(),
+        super((JFrame) WindowManager.getDefault().getMainWindow(),
                 NbBundle.getMessage(AddHashValuesToDatabaseDialog.class, "AddHashValuesToDatabaseDialog.JDialog.Title", hashDb.getHashSetName()),
                 true);
         this.hashDb = hashDb;
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java
index 1b60250a6b..bbc8630c9f 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbCreateDatabaseDialog.java
@@ -29,6 +29,7 @@ import javax.swing.JFrame;
 import javax.swing.JOptionPane;
 import org.apache.commons.io.FilenameUtils;
 import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
@@ -55,7 +56,7 @@ final class HashDbCreateDatabaseDialog extends javax.swing.JDialog {
      * known or known bad.
      */
     HashDbCreateDatabaseDialog() {
-        super(new JFrame(), NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.createHashDbMsg"), true);
+        super((JFrame) WindowManager.getDefault().getMainWindow(), NbBundle.getMessage(HashDbCreateDatabaseDialog.class, "HashDbCreateDatabaseDialog.createHashDbMsg"), true);
         initFileChooser();
         initComponents();
         display();
diff --git a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java
index 337fa49f0b..b1f30559d5 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/hashdatabase/HashDbImportDatabaseDialog.java
@@ -30,6 +30,7 @@ import javax.swing.JOptionPane;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import org.apache.commons.io.FilenameUtils;
 import org.openide.util.NbBundle;
+import org.openide.windows.WindowManager;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.ModuleSettings;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
@@ -55,7 +56,7 @@ final class HashDbImportDatabaseDialog extends javax.swing.JDialog {
      * unknown, known, or known bad.
      */
     HashDbImportDatabaseDialog() {
-        super(new JFrame(),
+        super((JFrame) WindowManager.getDefault().getMainWindow(),
                 NbBundle.getMessage(HashDbImportDatabaseDialog.class, "HashDbImportDatabaseDialog.importHashDbMsg"),
                 true);
         initFileChooser();