diff --git a/src/layout/DwindleLayout.cpp b/src/layout/DwindleLayout.cpp
index d2fe55d7..26536728 100644
--- a/src/layout/DwindleLayout.cpp
+++ b/src/layout/DwindleLayout.cpp
@@ -820,9 +820,17 @@ void CHyprDwindleLayout::toggleWindowGroup(CWindow* pWindow) {
 
             PWINDOW->m_bHidden = false;
         }
+	    
+	if (PHEAD->pPreviousGroupMember) {
+	    PHEAD->pPreviousGroupMember->pNextGroupMember = PHEAD->pNextGroupMember;
+	    PHEAD->pPreviousGroupMember = nullptr;
+	}
+
+	if (PHEAD->pNextGroupMember) {
+	    PHEAD->pNextGroupMember->pPreviousGroupMember = PHEAD->pPreviousGroupMember;
+	    PHEAD->pNextGroupMember = nullptr;
+	}
 
-        PHEAD->pPreviousGroupMember = nullptr;
-        PHEAD->pNextGroupMember = nullptr;
         onWindowRemoved(PHEAD->pWindow);
 
         for (auto& pw : toAddWindows) {