diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index fb92aab..925e7a3 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -508,13 +508,13 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
         }
 
         if (wxGetApp().getFrequency() != demodWaterfallCanvas->getCenterFrequency()) {
-            if (spectrumCanvas->getViewState() && abs(wxGetApp().getFrequency()-spectrumCanvas->getCenterFrequency()) > (wxGetApp().getSampleRate()/2)) {
-                spectrumCanvas->setCenterFrequency(wxGetApp().getFrequency());
-                waterfallCanvas->setCenterFrequency(wxGetApp().getFrequency());
-            }
             demodWaterfallCanvas->setCenterFrequency(wxGetApp().getFrequency());
             demodSpectrumCanvas->setCenterFrequency(wxGetApp().getFrequency());
         }
+        if (spectrumCanvas->getViewState() && abs(wxGetApp().getFrequency()-spectrumCanvas->getCenterFrequency()) > (wxGetApp().getSampleRate()/2)) {
+            spectrumCanvas->setCenterFrequency(wxGetApp().getFrequency());
+            waterfallCanvas->setCenterFrequency(wxGetApp().getFrequency());
+        }
     }
 
     if (!waterfallCanvas->HasFocus()) {