1 files changed, 2 insertions, 3 deletions

diff --git a/src/Ewmh.cc b/src/Ewmh.cc
index 147b7d3..fc4e3e1 100644
--- a/src/Ewmh.cc
+++ b/src/Ewmh.cc
@@ -1058,13 +1058,12 @@ void Ewmh::setState(FluxboxWindow &win, Atom state, bool value) {
     } else if (state == m_net_wm_state_below) {  // bottom layer
         if (value)
             win.moveToLayer(Layer::BOTTOM);
-        else
+        else if (win.layerNum() > Layer::NORMAL)
             win.moveToLayer(Layer::NORMAL);
-
     } else if (state == m_net_wm_state_above) { // above layer
         if (value)
             win.moveToLayer(Layer::ABOVE_DOCK);
-        else
+        else if (win.layerNum() < Layer::NORMAL)
             win.moveToLayer(Layer::NORMAL);
     } else if (state == m_net_wm_state_demands_attention) {
         if (value) { // if add attention