diff --git a/src/preferences/backgrounds/BackgroundsView.cpp b/src/preferences/backgrounds/BackgroundsView.cpp
index f3a25cd135..46de0a488f 100644
--- a/src/preferences/backgrounds/BackgroundsView.cpp
+++ b/src/preferences/backgrounds/BackgroundsView.cpp
@@ -602,7 +602,8 @@ BackgroundsView::Save()
 
 		if (fCurrentInfo != NULL) {
 			if (fWorkspaceMenu->FindItem(kMsgCurrentWorkspace)->IsMarked()) {
-				if (fCurrentInfo->fWorkspace != workspaceMask) {
+				if (fCurrentInfo->fWorkspace & workspaceMask
+					&& fCurrentInfo->fWorkspace != workspaceMask) {
 					fCurrentInfo->fWorkspace = fCurrentInfo->fWorkspace
 						^ workspaceMask;
 					if (fLastImageIndex > -1) {
@@ -612,7 +613,7 @@ BackgroundsView::Save()
 							fCurrentInfo->fCacheMode);
 						fCurrent->Add(fCurrentInfo);
 					}
-				} else {
+				} else if (fCurrentInfo->fWorkspace == workspaceMask) {
 					if (fLastImageIndex > -1) {
 						fCurrentInfo->fTextWidgetLabelOutline =
 							textWidgetLabelOutline;