diff --git a/src/main/java/io/github/dsheirer/spectrum/ClearTunerMenuItem.java b/src/main/java/io/github/dsheirer/spectrum/ClearTunerMenuItem.java
index 3da730c8..5085c41d 100644
--- a/src/main/java/io/github/dsheirer/spectrum/ClearTunerMenuItem.java
+++ b/src/main/java/io/github/dsheirer/spectrum/ClearTunerMenuItem.java
@@ -36,9 +36,9 @@ public class ClearTunerMenuItem extends JMenuItem
             @Override
             public void actionPerformed(ActionEvent e)
             {
-                mSpectralDisplayPanel.clearTuner();
                 SystemProperties properties = SystemProperties.getInstance();
                 properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, false);
+                mSpectralDisplayPanel.clearTuner();
             }
         });
     }
diff --git a/src/main/java/io/github/dsheirer/spectrum/ShowTunerMenuItem.java b/src/main/java/io/github/dsheirer/spectrum/ShowTunerMenuItem.java
index bfd510ca..71b4df5a 100644
--- a/src/main/java/io/github/dsheirer/spectrum/ShowTunerMenuItem.java
+++ b/src/main/java/io/github/dsheirer/spectrum/ShowTunerMenuItem.java
@@ -49,9 +49,9 @@ public class ShowTunerMenuItem extends JMenuItem
                     @Override
                     public void run()
                     {
-                        mDiscoveredTunerModel.broadcast(new TunerEvent(mTuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY));
                         SystemProperties properties = SystemProperties.getInstance();
                         properties.set(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true);
+                        mDiscoveredTunerModel.broadcast(new TunerEvent(mTuner, TunerEvent.Event.REQUEST_MAIN_SPECTRAL_DISPLAY));
                     }
                 });
             }
diff --git a/src/main/java/io/github/dsheirer/spectrum/SpectralDisplayPanel.java b/src/main/java/io/github/dsheirer/spectrum/SpectralDisplayPanel.java
index 7cca7817..8ec68dcf 100644
--- a/src/main/java/io/github/dsheirer/spectrum/SpectralDisplayPanel.java
+++ b/src/main/java/io/github/dsheirer/spectrum/SpectralDisplayPanel.java
@@ -423,6 +423,11 @@ public class SpectralDisplayPanel extends JPanel
     public void showTuner(Tuner tuner)
     {
         clearTuner();
+        if(!SystemProperties.getInstance().get(SpectralDisplayPanel.SPECTRAL_DISPLAY_ENABLED, true))
+        {
+            //Spectral display is disabled, stop
+            return;
+        }
 
         mComplexDftProcessor.clearBuffer();