diff --git a/src/kits/tracker/Utilities.cpp b/src/kits/tracker/Utilities.cpp
index a07b498ba0..4ea2a07b60 100644
--- a/src/kits/tracker/Utilities.cpp
+++ b/src/kits/tracker/Utilities.cpp
@@ -178,6 +178,10 @@ ValidateStream(BMallocIO* stream, uint32 key, int32 version)
 void
 DisallowFilenameKeys(BTextView* textView)
 {
+	// disallow control characters
+	for (uint32 i = 0; i < 0x20; ++i)
+		textView->DisallowChar(i);
+
 	textView->DisallowChar('/');
 }