diff --git a/src/servers/registrar/mime/CreateAppMetaMimeThread.cpp b/src/servers/registrar/mime/CreateAppMetaMimeThread.cpp
index bb7f46160b..27de6e6dc4 100644
--- a/src/servers/registrar/mime/CreateAppMetaMimeThread.cpp
+++ b/src/servers/registrar/mime/CreateAppMetaMimeThread.cpp
@@ -49,6 +49,13 @@ CreateAppMetaMimeThread::DoMimeUpdate(const entry_ref* ref, bool* _entryIsDir)
 	if (status < B_OK)
 		return status;
 
+	bool isDir = file.IsDirectory();
+	if (_entryIsDir != NULL)
+		*_entryIsDir = isDir;
+
+	if (isDir)
+		return B_OK;
+
 	BAppFileInfo appInfo(&file);
 	status = appInfo.InitCheck();
 	if (status < B_OK)
@@ -143,9 +150,6 @@ CreateAppMetaMimeThread::DoMimeUpdate(const entry_ref* ref, bool* _entryIsDir)
 			status = mime.SetIconForType(type, &largeIcon, B_LARGE_ICON);
 	}
 
-	if (status == B_OK && _entryIsDir != NULL)
-		*_entryIsDir = file.IsDirectory();
-
 	return status;
 }