diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index c8376c29..868f15e0 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -453,6 +453,9 @@ void CCompositor::focusWindow(CWindow* pWindow, wlr_surface* pSurface) {
         pWindow->m_cRealBorderColor = RENDERDATA.borderColor;
     else
         pWindow->m_cRealBorderColor = CColor(g_pConfigManager->getInt("general:col.active_border"));
+
+    // Send an event
+    g_pEventManager->postEvent(SHyprIPCEvent("activewindow", pWindow->m_szTitle));
 }
 
 void CCompositor::focusSurface(wlr_surface* pSurface, CWindow* pWindowOwner) {
diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index b5b8b806..e3e4bd36 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -91,7 +91,7 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus) {
         wlr_ext_workspace_handle_v1_set_active(g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)->m_pWlrHandle, true);
 
         // event
-        g_pEventManager->postEvent(SHyprIPCEvent("workspace", g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)->m_szName));
+        g_pEventManager->postEvent(SHyprIPCEvent("activemon", PMONITOR->szName + "," + g_pCompositor->getWorkspaceByID(PMONITOR->activeWorkspace)->m_szName));
     }
 
     Vector2D surfaceCoords;
diff --git a/src/managers/KeybindManager.cpp b/src/managers/KeybindManager.cpp
index d4340545..ed2be2c5 100644
--- a/src/managers/KeybindManager.cpp
+++ b/src/managers/KeybindManager.cpp
@@ -208,6 +208,10 @@ void CKeybindManager::changeworkspace(std::string args) {
 
             // start anim on new workspace
             PWORKSPACETOCHANGETO->startAnim(true, ANIMTOLEFT);
+
+            // Event ONLY if workspace is actually "changed" and we arent just focusing
+            if (!m_bSuppressWorkspaceChangeEvents)
+                g_pEventManager->postEvent(SHyprIPCEvent("workspace", PWORKSPACETOCHANGETO->m_szName));
         }
            
 
@@ -232,10 +236,6 @@ void CKeybindManager::changeworkspace(std::string args) {
         // mark the monitor dirty
         g_pHyprRenderer->damageMonitor(PMONITOR);
 
-        // Event
-        if (!m_bSuppressWorkspaceChangeEvents)
-            g_pEventManager->postEvent(SHyprIPCEvent("workspace", PWORKSPACETOCHANGETO->m_szName));
-
         return;
     }