diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
index 1e9d3568f1..3a294232af 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/ImageFilePanel.java
@@ -53,7 +53,7 @@ public class ImageFilePanel extends ContentTypePanel implements DocumentListener
     /**
      * Returns the default instance of a ImageFilePanel.
      */
-    public static ImageFilePanel getDefault() {
+    public static synchronized ImageFilePanel getDefault() {
         if (instance == null) {
             instance = new ImageFilePanel();
             instance.init();
diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
index 2a214f0b20..22466d2b27 100644
--- a/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/casemodule/LocalDiskPanel.java
@@ -61,7 +61,7 @@ public class LocalDiskPanel extends ContentTypePanel {
     /**
      * Get the default instance of this panel.
      */
-    public static LocalDiskPanel getDefault() {
+    public static synchronized LocalDiskPanel getDefault() {
         if (instance == null) {
             instance = new LocalDiskPanel();
             instance.init();