diff --git a/src/Window.hpp b/src/Window.hpp
index 21169796..0ee164dc 100644
--- a/src/Window.hpp
+++ b/src/Window.hpp
@@ -118,6 +118,9 @@ public:
     // For hidden windows and stuff
     bool            m_bHidden = false;
 
+    // for proper cycling. While cycling we can't just move the pointers, so we need to keep track of the last cycled window.
+    CWindow*        m_pLastCycledWindow = nullptr;
+
     // Foreign Toplevel proto
     wlr_foreign_toplevel_handle_v1* m_phForeignToplevel = nullptr;
 
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index a4ddd809..e3799a7c 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -1448,12 +1448,24 @@ void CKeybindManager::swapnext(std::string arg) {
 
     const auto PLASTWINDOW = g_pCompositor->m_pLastWindow;
 
+    const auto PLASTCYCLED = g_pCompositor->windowValidMapped(g_pCompositor->m_pLastWindow->m_pLastCycledWindow) && g_pCompositor->m_pLastWindow->m_pLastCycledWindow->m_iWorkspaceID == PLASTWINDOW->m_iWorkspaceID ? g_pCompositor->m_pLastWindow->m_pLastCycledWindow : nullptr;
+
     if (arg == "last" || arg == "l" || arg == "prev" || arg == "p")
-        toSwap = g_pCompositor->getPrevWindowOnWorkspace(PLASTWINDOW);
+        toSwap = g_pCompositor->getPrevWindowOnWorkspace(PLASTCYCLED ? PLASTCYCLED : PLASTWINDOW);
     else
-        toSwap = g_pCompositor->getNextWindowOnWorkspace(PLASTWINDOW);
+        toSwap = g_pCompositor->getNextWindowOnWorkspace(PLASTCYCLED ? PLASTCYCLED : PLASTWINDOW);
+
+    // sometimes we may come back to ourselves.
+    if (toSwap == PLASTWINDOW) {
+        if (arg == "last" || arg == "l" || arg == "prev" || arg == "p")
+            toSwap = g_pCompositor->getPrevWindowOnWorkspace(PLASTWINDOW);
+        else
+            toSwap = g_pCompositor->getNextWindowOnWorkspace(PLASTWINDOW);
+    }
 
     g_pLayoutManager->getCurrentLayout()->switchWindows(PLASTWINDOW, toSwap);
 
+    PLASTWINDOW->m_pLastCycledWindow = toSwap;
+
     g_pCompositor->focusWindow(PLASTWINDOW);
 }