diff --git a/Config/BWIBuildSettings.swift b/Config/BWIBuildSettings.swift
index 7a0669446..1eafd2df4 100644
--- a/Config/BWIBuildSettings.swift
+++ b/Config/BWIBuildSettings.swift
@@ -684,4 +684,7 @@ class BWIBuildSettings: NSObject {
     
     // MARK: App Config
     var avoidServerSelectionOnAppConfig = false
+    
+    // MARK: Content Scanner Status Thumbnail
+    var showContentScannerStatusWithFilename = true
 }
diff --git a/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnailContentView.swift b/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnailContentView.swift
index aaefa4d4a..30db8ffc3 100644
--- a/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnailContentView.swift
+++ b/bwi/ContentScanner/UI/Thumbnail/ContentScannerThumbnailContentView.swift
@@ -61,13 +61,16 @@ struct ThumbnailAttributedStatus: View {
     
     var body: some View {
 
-        let t = Text(verbatim: filename)
-            .foregroundColor(filenameColor) +
+        HStack {
+            if BWIBuildSettings.shared.showContentScannerStatusWithFilename {
+                Text(verbatim: filename)
+                    .foregroundColor(filenameColor)
+                    .font(.system(size: 15))
+            }
             Text(verbatim: status)
                 .foregroundColor(statusColor)
-        
-        return t
-            .font(.system(size: 15))
+                .font(.system(size: 15))
+        }
     }
 }