diff --git a/src/preferences/backgrounds/BackgroundsView.cpp b/src/preferences/backgrounds/BackgroundsView.cpp
index 46de0a488f..c887a248b4 100644
--- a/src/preferences/backgrounds/BackgroundsView.cpp
+++ b/src/preferences/backgrounds/BackgroundsView.cpp
@@ -360,11 +360,12 @@ BackgroundsView::MessageReceived(BMessage *msg)
 			fImageMenu->FindItem(kMsgNoImage)->SetLabel("None");
 			fLastWorkspaceIndex = fWorkspaceMenu->IndexOf(
 				fWorkspaceMenu->FindMarked());
-			if (!fCurrent->IsDesktop()) {
+			if (fCurrent && fCurrent->IsDesktop()) {
+				UpdateButtons();
+			} else {
 				fPreview->SetDesktop(true);
 				LoadDesktopFolder();
-			} else
-				UpdateButtons();
+			}
 			break;
 
 		case kMsgDefaultFolder: