diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 49772f7bf8..e7287a7d84 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1859,6 +1859,7 @@ UIs
 Ulaanbaatar
 ULARGE
 ULONGLONG
+unassign
 uncompilable
 UNCPRIORITY
 UNDNAME
diff --git a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
index 95c80c80e1..5f53d3e9c6 100644
--- a/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/FancyZones.cpp
@@ -808,6 +808,15 @@ bool FancyZones::OnSnapHotkeyBasedOnZoneNumber(HWND window, DWORD vkCode) noexce
             auto workArea = m_workAreaHandler.GetWorkArea(VirtualDesktop::instance().GetCurrentVirtualDesktopId(), *currMonitorInfo);
             if (m_windowMoveHandler.MoveWindowIntoZoneByDirectionAndIndex(window, vkCode, false /* cycle through zones */, workArea))
             {
+                // unassign from previous work area
+                for (auto& prevWorkArea : m_workAreaHandler.GetAllWorkAreas())
+                {
+                    if (workArea != prevWorkArea)
+                    {
+                        prevWorkArea->UnsnapWindow(window);
+                    }
+                }
+                
                 Trace::FancyZones::KeyboardSnapWindowToZone(workArea->GetLayout().get(), workArea->GetLayoutWindows().get());
                 return true;
             }
diff --git a/src/modules/fancyzones/FancyZonesLib/WindowMoveHandler.cpp b/src/modules/fancyzones/FancyZonesLib/WindowMoveHandler.cpp
index b72ab58aac..a53d4d3981 100644
--- a/src/modules/fancyzones/FancyZonesLib/WindowMoveHandler.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/WindowMoveHandler.cpp
@@ -134,11 +134,7 @@ void WindowMoveHandler::MoveSizeStart(HWND window, HMONITOR monitor, POINT const
     auto workArea = workAreaMap.find(monitor);
     if (workArea != workAreaMap.end())
     {
-        const auto& layoutWindows = workArea->second->GetLayoutWindows();
-        if (layoutWindows)
-        {
-            layoutWindows->Dismiss(window);
-        }
+        workArea->second->UnsnapWindow(window);
     }
 }
 
@@ -289,6 +285,8 @@ void WindowMoveHandler::MoveSizeEnd(HWND window, const std::unordered_map<HMONIT
                         AppZoneHistory::instance().RemoveAppLastZone(window, workAreaPtr->UniqueId(), guidStr.value());
                     }
                 }
+
+                workAreaPtr->UnsnapWindow(window);
             }
         }
 
diff --git a/src/modules/fancyzones/FancyZonesLib/WorkArea.cpp b/src/modules/fancyzones/FancyZonesLib/WorkArea.cpp
index 58608f5401..a35ad9a3b4 100644
--- a/src/modules/fancyzones/FancyZonesLib/WorkArea.cpp
+++ b/src/modules/fancyzones/FancyZonesLib/WorkArea.cpp
@@ -462,6 +462,22 @@ void WorkArea::SaveWindowProcessToZoneIndex(HWND window) noexcept
     }
 }
 
+bool WorkArea::UnsnapWindow(HWND window) noexcept
+{
+    if (!m_layoutWindows)
+    {
+        return false;    
+    }
+    
+    if (!m_layoutWindows->GetZoneIndexSetFromWindow(window).empty())
+    {
+        m_layoutWindows->Dismiss(window);
+        return true;
+    }
+
+    return false;
+}
+
 ZoneIndexSet WorkArea::GetWindowZoneIndexes(HWND window) const noexcept
 {
     if (m_layout)
diff --git a/src/modules/fancyzones/FancyZonesLib/WorkArea.h b/src/modules/fancyzones/FancyZonesLib/WorkArea.h
index d3cf1441db..61458f7179 100644
--- a/src/modules/fancyzones/FancyZonesLib/WorkArea.h
+++ b/src/modules/fancyzones/FancyZonesLib/WorkArea.h
@@ -69,6 +69,7 @@ public:
     bool MoveWindowIntoZoneByDirectionAndPosition(HWND window, DWORD vkCode, bool cycle) noexcept;
     bool ExtendWindowByDirectionAndPosition(HWND window, DWORD vkCode) noexcept;
     void SaveWindowProcessToZoneIndex(HWND window) noexcept;
+    bool UnsnapWindow(HWND window) noexcept;
 
     void UpdateActiveZoneSet() noexcept;