diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp
index e7291eeed1..89a6688386 100644
--- a/src/kits/tracker/ContainerWindow.cpp
+++ b/src/kits/tracker/ContainerWindow.cpp
@@ -171,7 +171,7 @@ StripShortcut(const Model *model, char *result, uint32 &shortcut)
 
 	// check if there is a shortcut in the model name
 	uint32 length = strlen(result);
-	if (result[length - 2] == '-' && length > 2) {
+	if (length > 2 && result[length - 2] == '-') {
 		shortcut = result[length - 1];
 		result[length - 2] = '\0';
 		return;
@@ -180,7 +180,7 @@ StripShortcut(const Model *model, char *result, uint32 &shortcut)
 	// check if there is a shortcut in the filename
 	char* refName = model->EntryRef()->name;
 	length = strlen(refName);
-	if (refName[length - 2] == '-' && length > 2) {
+	if (length > 2 && refName[length - 2] == '-') {
 		shortcut = refName[length - 1];
 		return;
 	}