diff --git a/src/focus.rs b/src/focus.rs
index d4b5deb7e..e033a49c4 100644
--- a/src/focus.rs
+++ b/src/focus.rs
@@ -43,7 +43,19 @@ fn resolve_focus_target(core: &CoreCtx, win: Option<WindowId>) -> Option<FocusTa
     });
 
     if target.is_none() {
-        target = mon.first_visible_client(core.globals().clients.map());
+        // Try focus history first
+        if let Some(&hist_win) = mon.tag_focus_history.get(&selected.bits()) {
+            if core.globals().clients.get(&hist_win).map_or(false, |c| {
+                c.is_visible_on_tags(selected.bits()) && !c.is_hidden
+            }) {
+                target = Some(hist_win);
+            }
+        }
+
+        // Fallback to top of stack
+        if target.is_none() {
+            target = mon.first_visible_client(core.globals().clients.map());
+        }
     }
 
     Some(FocusTargetResult {
@@ -66,6 +78,9 @@ fn update_focus_state(core: &mut CoreCtx, result: FocusTargetResult) -> (Option<
 
     if let Some(mon) = core.globals_mut().monitor_mut(sel_mon_id) {
         mon.sel = target;
+        if let Some(t) = target {
+            mon.tag_focus_history.insert(mon.selected_tags(), t);
+        }
     }
 
     (target, selection_state_changed)
diff --git a/src/types/monitor.rs b/src/types/monitor.rs
index d06e03ef1..06d9667a9 100644
--- a/src/types/monitor.rs
+++ b/src/types/monitor.rs
@@ -74,6 +74,8 @@ pub struct Monitor {
     pub clients: Vec<WindowId>,
     /// Currently selected client.
     pub sel: Option<WindowId>,
+    /// Focus history per tag mask.
+    pub tag_focus_history: HashMap<u32, WindowId>,
     /// Overlay window.
     pub overlay: Option<WindowId>,
     /// Stack list (stacking order).
@@ -112,6 +114,7 @@ impl Default for Monitor {
             tags: Vec::new(),
             clients: Vec::new(),
             sel: None,
+            tag_focus_history: HashMap::new(),
             overlay: None,
             stack: Vec::new(),
             fullscreen: None,