1 files changed, 4 insertions, 2 deletions
diff --git a/engines/wage/macwindowmanager.cpp b/engines/wage/macwindowmanager.cpp
index 78ca6aded4..61beca8d4d 100644
--- a/engines/wage/macwindowmanager.cpp
+++ b/engines/wage/macwindowmanager.cpp
@@ -74,11 +74,11 @@ int MacWindowManager::add(bool scrollable) {
     _windows.push_back(w);
     _windowStack.push_back(w);
 
-    _activeWindow = _lastId;
+    setActive(_lastId);
 
     _lastId++;
 
-    return _activeWindow;
+    return _lastId - 1;
 }
 
 void MacWindowManager::setActive(int id) {
@@ -88,6 +88,8 @@ void MacWindowManager::setActive(int id) {
     if (_activeWindow != -1)
         _windows[_activeWindow]->setActive(false);
 
+    _activeWindow = id;
+
     _windows[id]->setActive(true);
 
     _windowStack.remove(_windows[id]);