diff --git a/src/Common/gui/NinjamRoomWindow.cpp b/src/Common/gui/NinjamRoomWindow.cpp
index ecd877eef..7644f26d9 100755
--- a/src/Common/gui/NinjamRoomWindow.cpp
+++ b/src/Common/gui/NinjamRoomWindow.cpp
@@ -393,6 +393,8 @@ void NinjamRoomWindow::removeChannel(const Ninjam::User &user, const Ninjam::Use
     }
 
     updateTracksSizeButtons();
+
+    reAddTrackGroups(); // update the gridlayout to avoid empty cells
 }
 
 NinjamTrackView *NinjamRoomWindow::getTrackViewByID(long trackID)