diff --git a/src/kits/interface/Shelf.cpp b/src/kits/interface/Shelf.cpp
index 5ffc5c8946..f7fba55fbc 100644
--- a/src/kits/interface/Shelf.cpp
+++ b/src/kits/interface/Shelf.cpp
@@ -1500,9 +1500,7 @@ BShelf::_GetProperty(BMessage *msg, BMessage *reply)
 				ReplicantAt(i, &view, &ID, &err);
 				if (err != B_OK || view == NULL)
 					continue;
-				if (view->Name() != NULL &&
-					strlen(view->Name()) == strlen(name) &&
-					!strcmp(view->Name(), name)) {
+				if (BString(view->Name()) == name) {
 					replicant = view;
 					break;
 				}