diff --git a/src/shell/panelview.cpp b/src/shell/panelview.cpp
index 903c076e3..d85c088e7 100644
--- a/src/shell/panelview.cpp
+++ b/src/shell/panelview.cpp
@@ -293,8 +293,11 @@ void PanelView::setVisibilityMode(PanelView::VisibilityMode mode)
 
     if (mode == LetWindowsCover) {
         KWindowSystem::setState(winId(), NET::KeepBelow);
+        KWindowSystem::clearState(winId(), NET::KeepAbove|NET::StaysOnTop);
+        
     } else {
         KWindowSystem::clearState(winId(), NET::KeepBelow);
+        KWindowSystem::setState(winId(), NET::KeepAbove|NET::StaysOnTop);
     }
     //life is vastly simpler if we ensure we're visible now
     show();