diff --git a/src/CellularPanel.cpp b/src/CellularPanel.cpp
index ea7712b28..670e2b527 100644
--- a/src/CellularPanel.cpp
+++ b/src/CellularPanel.cpp
@@ -842,6 +842,11 @@ void CellularPanel::HandleClick( const TrackPanelMouseEvent &tpmEvent )
       else {
          Filter::spActivePanel = this;
 
+#if wxUSE_TOOLTIPS
+         // Remove any outstanding tooltip
+         UnsetToolTip();
+#endif
+
          if( !HasFocus() && AcceptsFocus() )
             SetFocusIgnoringChildren();