diff --git a/src/desktop/Window.cpp b/src/desktop/Window.cpp
index ceb21d09c..14c9d4cef 100644
--- a/src/desktop/Window.cpp
+++ b/src/desktop/Window.cpp
@@ -1045,8 +1045,10 @@ void CWindow::setGroupCurrent(PHLWINDOW pWindow) {
 
     const auto CURRENTISFOCUS = PCURRENT == g_pCompositor->m_lastWindow.lock();
 
-    const auto PWINDOWSIZE                 = PCURRENT->m_realSize->goal();
-    const auto PWINDOWPOS                  = PCURRENT->m_realPosition->goal();
+    const auto PWINDOWSIZE                 = PCURRENT->m_realSize->value();
+    const auto PWINDOWPOS                  = PCURRENT->m_realPosition->value();
+    const auto PWINDOWSIZEGOAL             = PCURRENT->m_realSize->goal();
+    const auto PWINDOWPOSGOAL              = PCURRENT->m_realPosition->goal();
     const auto PWINDOWLASTFLOATINGSIZE     = PCURRENT->m_lastFloatingSize;
     const auto PWINDOWLASTFLOATINGPOSITION = PCURRENT->m_lastFloatingPosition;
 
@@ -1058,8 +1060,14 @@ void CWindow::setGroupCurrent(PHLWINDOW pWindow) {
 
     g_pLayoutManager->getCurrentLayout()->replaceWindowDataWith(PCURRENT, pWindow);
 
-    pWindow->m_realPosition->setValueAndWarp(PWINDOWPOS);
-    pWindow->m_realSize->setValueAndWarp(PWINDOWSIZE);
+    if (PCURRENT->m_isFloating) {
+        pWindow->m_realPosition->setValueAndWarp(PWINDOWPOSGOAL);
+        pWindow->m_realSize->setValueAndWarp(PWINDOWSIZEGOAL);
+        pWindow->sendWindowSize();
+    }
+
+    pWindow->m_realPosition->setValue(PWINDOWPOS);
+    pWindow->m_realSize->setValue(PWINDOWSIZE);
 
     if (FULLSCREEN)
         g_pCompositor->setWindowFullscreenInternal(pWindow, MODE);
@@ -1081,13 +1089,11 @@ void CWindow::insertWindowToGroup(PHLWINDOW pWindow) {
     const auto BEGINAT = m_self.lock();
     const auto ENDAT   = m_groupData.pNextWindow.lock();
 
-    if (!pWindow->getDecorationByType(DECORATION_GROUPBAR))
-        pWindow->addWindowDeco(makeUnique<CHyprGroupBarDecoration>(pWindow));
-
     if (!pWindow->m_groupData.pNextWindow.lock()) {
         BEGINAT->m_groupData.pNextWindow = pWindow;
         pWindow->m_groupData.pNextWindow = ENDAT;
         pWindow->m_groupData.head        = false;
+        pWindow->addWindowDeco(makeUnique<CHyprGroupBarDecoration>(pWindow));
         return;
     }
 
diff --git a/src/layout/IHyprLayout.cpp b/src/layout/IHyprLayout.cpp
index d97f87961..aacb9c454 100644
--- a/src/layout/IHyprLayout.cpp
+++ b/src/layout/IHyprLayout.cpp
@@ -49,9 +49,10 @@ void IHyprLayout::onWindowRemoved(PHLWINDOW pWindow) {
         g_pCompositor->setWindowFullscreenInternal(pWindow, FSMODE_NONE);
 
     if (!pWindow->m_groupData.pNextWindow.expired()) {
-        if (pWindow->m_groupData.pNextWindow.lock() == pWindow)
+        if (pWindow->m_groupData.pNextWindow.lock() == pWindow) {
             pWindow->m_groupData.pNextWindow.reset();
-        else {
+            pWindow->updateWindowDecos();
+        } else {
             // find last window and update
             PHLWINDOW  PWINDOWPREV     = pWindow->getGroupPrevious();
             const auto WINDOWISVISIBLE = pWindow->getGroupCurrent() == pWindow;
@@ -226,9 +227,6 @@ bool IHyprLayout::onWindowCreatedAutoGroup(PHLWINDOW pWindow) {
         pWindow->updateWindowDecos();
         recalculateWindow(pWindow);
 
-        if (!pWindow->getDecorationByType(DECORATION_GROUPBAR))
-            pWindow->addWindowDeco(makeUnique<CHyprGroupBarDecoration>(pWindow));
-
         return true;
     }
 
@@ -355,9 +353,6 @@ void IHyprLayout::onEndDragWindow() {
                 pWindow->setGroupCurrent(DRAGGINGWINDOW);
                 DRAGGINGWINDOW->applyGroupRules();
                 DRAGGINGWINDOW->updateWindowDecos();
-
-                if (!DRAGGINGWINDOW->getDecorationByType(DECORATION_GROUPBAR))
-                    DRAGGINGWINDOW->addWindowDeco(makeUnique<CHyprGroupBarDecoration>(DRAGGINGWINDOW));
             }
         }
     }
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index 43558d9d6..ac2dc63f7 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -2942,9 +2942,6 @@ void CKeybindManager::moveWindowIntoGroup(PHLWINDOW pWindow, PHLWINDOW pWindowIn
     g_pCompositor->focusWindow(pWindow);
     pWindow->warpCursor();
 
-    if (!pWindow->getDecorationByType(DECORATION_GROUPBAR))
-        pWindow->addWindowDeco(makeUnique<CHyprGroupBarDecoration>(pWindow));
-
     g_pEventManager->postEvent(SHyprIPCEvent{"moveintogroup", std::format("{:x}", (uintptr_t)pWindow.get())});
 }