diff --git a/src/steamcompmgr.cpp b/src/steamcompmgr.cpp
index 1ad13a6..6085c6d 100644
--- a/src/steamcompmgr.cpp
+++ b/src/steamcompmgr.cpp
@@ -6096,7 +6096,7 @@ void update_wayland_res(CommitDoneList_t *doneCommits, steamcompmgr_win_t *w, Re
 	}
 
 	// If we have an override surface, make sure this commit is for the current surface.
-	bool for_current_surface = !w->override_surface || w->current_surface() == reslistentry.surf;
+	bool for_current_surface = !w->override_surface() || w->current_surface() == reslistentry.surf;
 	if (!for_current_surface)
 	{
 		wlserver_lock();
diff --git a/src/steamcompmgr_shared.hpp b/src/steamcompmgr_shared.hpp
index 2711c41..2b0f2e4 100644
--- a/src/steamcompmgr_shared.hpp
+++ b/src/steamcompmgr_shared.hpp
@@ -168,4 +168,12 @@ struct steamcompmgr_win_t {
 
 		return main_surface();
 	}
+
+	wlr_surface *override_surface() const
+	{
+		if (type == steamcompmgr_win_type_t::XWAYLAND)
+			return xwayland().surface.override_surface;
+		else
+			return nullptr;
+	}
 };