diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index 78ea320d..86098bbb 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -152,4 +152,45 @@ SMonitor* CCompositor::getMonitorFromCursor() {
 
 void CCompositor::removeWindowFromVectorSafe(CWindow* pWindow) {
     m_lWindows.remove(*pWindow);
+}
+
+bool CCompositor::windowExists(CWindow* pWindow) {
+    for (auto& w : m_lWindows) {
+        if (&w == pWindow)
+            return true;
+    }
+
+    return false;
+}
+
+CWindow* CCompositor::vectorToWindow(const Vector2D& pos) {
+    for (auto& w : m_lWindows) {
+        wlr_box box = {w.m_vPosition.x, w.m_vPosition.y, w.m_vSize.x, w.m_vSize.y};
+        if (wlr_box_contains_point(&box, pos.x, pos.y))
+            return &w;
+    }
+
+    return nullptr;
+}
+
+void CCompositor::focusWindow(CWindow* pWindow) {
+
+    if (!pWindow) {
+        wlr_seat_keyboard_notify_clear_focus(m_sWLRSeat);
+        return;
+    }
+
+    const auto PWINDOWSURFACE = g_pXWaylandManager->getWindowSurface(pWindow);
+
+    if (m_sWLRSeat->keyboard_state.focused_surface == PWINDOWSURFACE)
+        return; // Don't focus when already focused on this.
+
+    const auto KEYBOARD = wlr_seat_get_keyboard(m_sWLRSeat);
+    wlr_seat_keyboard_notify_enter(m_sWLRSeat, PWINDOWSURFACE, KEYBOARD->keycodes, KEYBOARD->num_keycodes, &KEYBOARD->modifiers);
+
+    g_pXWaylandManager->activateSurface(PWINDOWSURFACE, true);
+    if (m_pLastFocus && windowExists(m_pLastFocus))
+        g_pXWaylandManager->activateSurface(g_pXWaylandManager->getWindowSurface(m_pLastFocus), false);
+    
+    m_pLastFocus = pWindow;
 }
\ No newline at end of file
diff --git a/src/Compositor.hpp b/src/Compositor.hpp
index 5cf039aa..d35604a7 100644
--- a/src/Compositor.hpp
+++ b/src/Compositor.hpp
@@ -50,12 +50,17 @@ public:
 
     void                    startCompositor(); 
 
+    CWindow*                m_pLastFocus = nullptr;
+
 
     // ------------------------------------------------- //
 
     SMonitor*               getMonitorFromID(const int&);
     SMonitor*               getMonitorFromCursor();
     void                    removeWindowFromVectorSafe(CWindow*);
+    void                    focusWindow(CWindow*);
+    bool                    windowExists(CWindow*);
+    CWindow*                vectorToWindow(const Vector2D&);
 };
 
 
diff --git a/src/events/Events.cpp b/src/events/Events.cpp
index 83a2fa20..9acea081 100644
--- a/src/events/Events.cpp
+++ b/src/events/Events.cpp
@@ -347,7 +347,7 @@ void Events::listener_newInput(wl_listener* listener, void* data) {
             break;
         case WLR_INPUT_DEVICE_POINTER:
             Debug::log(LOG, "Attached a mouse with name %s", DEVICE->name);
-            wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, DEVICE);
+            g_pInputManager->newMouse(DEVICE);
             break;
         default:
             break;
diff --git a/src/managers/InputManager.cpp b/src/managers/InputManager.cpp
index db5e049a..5fb67b0a 100644
--- a/src/managers/InputManager.cpp
+++ b/src/managers/InputManager.cpp
@@ -19,7 +19,8 @@ void CInputManager::onMouseMoved(wlr_event_pointer_motion* e) {
     if (e->time_msec)
         wlr_idle_notify_activity(g_pCompositor->m_sWLRIdle, g_pCompositor->m_sWLRSeat);
 
-    // todo: focus
+
+    g_pCompositor->focusWindow(g_pCompositor->vectorToWindow(getMouseCoordsInternal()));
     // todo: pointer
 }
 
@@ -74,6 +75,20 @@ void CInputManager::newKeyboard(wlr_input_device* keyboard) {
     wlr_seat_set_keyboard(g_pCompositor->m_sWLRSeat, keyboard);
 }
 
+void CInputManager::newMouse(wlr_input_device* mouse) {
+    if (wlr_input_device_is_libinput(mouse)) {
+        const auto LIBINPUTDEV = (libinput_device*)wlr_libinput_get_device_handle(mouse);
+
+        if (libinput_device_config_tap_get_finger_count(LIBINPUTDEV))  // this is for tapping (like on a laptop)
+            libinput_device_config_tap_set_enabled(LIBINPUTDEV, LIBINPUT_CONFIG_TAP_ENABLED);
+
+        if (libinput_device_config_scroll_has_natural_scroll(LIBINPUTDEV))
+            libinput_device_config_scroll_set_natural_scroll_enabled(LIBINPUTDEV, 0 /* Natural */);
+    }
+
+    wlr_cursor_attach_input_device(g_pCompositor->m_sWLRCursor, mouse);
+}
+
 void CInputManager::onKeyboardKey(wlr_event_keyboard_key* event) {
 
 }
diff --git a/src/managers/InputManager.hpp b/src/managers/InputManager.hpp
index f6ab8c7b..78601862 100644
--- a/src/managers/InputManager.hpp
+++ b/src/managers/InputManager.hpp
@@ -14,6 +14,7 @@ public:
     void            onKeyboardMod(void*);
 
     void            newKeyboard(wlr_input_device*);
+    void            newMouse(wlr_input_device*);
 
     Vector2D        getMouseCoordsInternal();