diff --git a/repos/os/include/decorator/window.h b/repos/os/include/decorator/window.h
index e5a54cc487..bc097c9de8 100644
--- a/repos/os/include/decorator/window.h
+++ b/repos/os/include/decorator/window.h
@@ -141,6 +141,8 @@ class Decorator::Window_base : private Genode::List_model<Window_base>::Element
 			_stacked  = true;
 		}
 
+		void forget_neighbor() { _neighbor.destruct(); }
+
 		bool back_most() const
 		{
 			return _stacked && !_neighbor.constructed();
diff --git a/repos/os/include/decorator/window_stack.h b/repos/os/include/decorator/window_stack.h
index 518cecbfe2..e305a84d49 100644
--- a/repos/os/include/decorator/window_stack.h
+++ b/repos/os/include/decorator/window_stack.h
@@ -257,7 +257,7 @@ void Decorator::Window_stack::update_model(Genode::Xml_node root_node,
 		reversed.remove(back_most);
 		Window_base &window = *back_most->object();
 		stack_back_most_window(window);
-		window.stacking_neighbor(Gui::View_id());
+		window.forget_neighbor();
 
 		Window_base *neighbor = &window;