diff --git a/repos/gems/src/app/window_layouter/focus_history.h b/repos/gems/src/app/window_layouter/focus_history.h
index 3cd8af3d0c..9e267e6803 100644
--- a/repos/gems/src/app/window_layouter/focus_history.h
+++ b/repos/gems/src/app/window_layouter/focus_history.h
@@ -76,7 +76,7 @@ class Window_layouter::Focus_history
 
 			Entry * const entry = _lookup(window_id);
 			if (!entry)
-				return Window_id();
+				return first->window_id;
 
 			Entry * const next  = entry->next();
 			return next ? next->window_id : first->window_id;