diff --git a/app/cwm/group.c b/app/cwm/group.c
index a38a00533..17de90455 100644
--- a/app/cwm/group.c
+++ b/app/cwm/group.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: group.c,v 1.54 2011/10/12 15:43:50 okan Exp $
+ * $OpenBSD: group.c,v 1.55 2011/12/29 20:48:38 okan Exp $
  */
 
 #include <sys/param.h>
@@ -222,11 +222,13 @@ group_movetogroup(struct client_ctx *cc, int idx)
 		err(1, "group_movetogroup: index out of range (%d)", idx);
 
 	gc = &sc->groups[idx];
+	if (cc->group == gc)
+		return;
 	if (gc->hidden) {
 		client_hide(cc);
 		gc->nhidden++;
 	}
-	group_add(&sc->groups[idx], cc);
+	group_add(gc, cc);
 }
 
 /*