1 files changed, 2 insertions, 1 deletions

diff --git a/src/Window.cc b/src/Window.cc
index 1914195..ea04d9c 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -939,7 +939,8 @@ void FluxboxWindow::moveClientLeft() {
 }
 
 void FluxboxWindow::moveClientRight() {
-    if (m_clientlist.size() == 1)
+    if (m_clientlist.size() == 1 ||
+            *m_clientlist.rbegin() == &winClient())
         return;
     // move label button to the right
     frame().moveLabelButtonRight(*m_labelbuttons[&winClient()]);