diff --git a/src/preferences/screen/ScreenWindow.cpp b/src/preferences/screen/ScreenWindow.cpp
index a02aa2094b..503d63db6c 100644
--- a/src/preferences/screen/ScreenWindow.cpp
+++ b/src/preferences/screen/ScreenWindow.cpp
@@ -1029,8 +1029,8 @@ ScreenWindow::_WriteVesaModeFile(const screen_mode& mode) const
 bool
 ScreenWindow::CanApply() const
 {
-	return fAllWorkspacesItem->IsMarked() || fSelected != fOriginal
-			|| fSelected != fActive;
+	return fAllWorkspacesItem->IsMarked() || fSelected != fActive
+			|| (fSelected == fOriginal && fActive != fOriginal);
 }