diff --git a/src/plugins/flashing/src/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java b/src/plugins/flashing/src/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java
index ef306e87..6c7ebb36 100644
--- a/src/plugins/flashing/src/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java
+++ b/src/plugins/flashing/src/java/org/jivesoftware/spark/plugin/flashing/FlashingPreference.java
@@ -19,11 +19,13 @@
  */
 package org.jivesoftware.spark.plugin.flashing;
 
+import java.awt.EventQueue;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
 import javax.swing.JComponent;
 
 import org.jivesoftware.spark.preference.Preference;
+import org.jivesoftware.spark.util.log.Log;
 
 public class FlashingPreference implements Preference {
 	public static String NAMESPACE = "flashing";
@@ -32,7 +34,22 @@ public class FlashingPreference implements Preference {
 
 	public FlashingPreference() {
 		preferences = new FlashingPreferences();
-			
+		try {
+            if (EventQueue.isDispatchThread()) {
+                dialog = new FlashingPreferenceDialog();
+            } else {
+                EventQueue.invokeAndWait(new Runnable()
+                {
+                    @Override
+                    public void run()
+                    {
+                        dialog = new FlashingPreferenceDialog();
+                    }
+                });
+            }
+		} catch (Exception e) {
+            Log.error(e);
+		}		
 	}
 
 	public FlashingPreferences getPreferences() {