diff --git a/src/AppFrame.cpp b/src/AppFrame.cpp
index aeb71b4..84200e7 100644
--- a/src/AppFrame.cpp
+++ b/src/AppFrame.cpp
@@ -1491,7 +1491,7 @@ void AppFrame::OnIdle(wxIdleEvent& event) {
 #endif
     
 #ifdef _WIN32
-    if (scopeCanvas->HasFocus() || spectrumCanvas->HasFocus()) {
+    if (scopeCanvas->HasFocus()) {
         waterfallCanvas->SetFocus();
     }
 #endif
diff --git a/src/visual/SpectrumCanvas.cpp b/src/visual/SpectrumCanvas.cpp
index 69d0e00..faad1cb 100644
--- a/src/visual/SpectrumCanvas.cpp
+++ b/src/visual/SpectrumCanvas.cpp
@@ -248,6 +248,9 @@ void SpectrumCanvas::OnMouseDown(wxMouseEvent& event) {
 
 void SpectrumCanvas::OnMouseWheelMoved(wxMouseEvent& event) {
     InteractiveCanvas::OnMouseWheelMoved(event);
+    if (waterfallCanvas) {
+        waterfallCanvas->OnMouseWheelMoved(event);
+    }
 }
 
 void SpectrumCanvas::OnMouseReleased(wxMouseEvent& event) {
diff --git a/src/visual/WaterfallCanvas.h b/src/visual/WaterfallCanvas.h
index 038e699..aa53448 100644
--- a/src/visual/WaterfallCanvas.h
+++ b/src/visual/WaterfallCanvas.h
@@ -35,7 +35,8 @@ public:
 
     void OnKeyDown(wxKeyEvent& event);
     void OnKeyUp(wxKeyEvent& event);
-
+    void OnMouseWheelMoved(wxMouseEvent& event);
+    
 private:
     void OnPaint(wxPaintEvent& event);
     void OnIdle(wxIdleEvent &event);
@@ -43,7 +44,6 @@ private:
     void updateHoverState();
     
     void OnMouseMoved(wxMouseEvent& event);
-    void OnMouseWheelMoved(wxMouseEvent& event);
     void OnMouseDown(wxMouseEvent& event);
     void OnMouseReleased(wxMouseEvent& event);
     void OnMouseRightDown(wxMouseEvent& event);