diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
index f3e471b0712..aeeeb675a36 100644
--- a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
+++ b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesPopover.tsx
@@ -101,7 +101,7 @@ export const AttachedFilesPopover: FunctionComponent<Props> = observer(
               <div className="relative">
                 <input
                   type="text"
-                  className="w-full rounded py-1.5 px-3 text-input bg-default border-solid border-1 border-main"
+                  className="color-text w-full rounded py-1.5 px-3 text-input bg-default border-solid border-1 border-main"
                   placeholder="Search files..."
                   value={searchQuery}
                   onInput={(e) => {
diff --git a/app/assets/javascripts/UIModels/AppState/FeaturesState.ts b/app/assets/javascripts/UIModels/AppState/FeaturesState.ts
index 3e9391c46e2..8bcb2475eee 100644
--- a/app/assets/javascripts/UIModels/AppState/FeaturesState.ts
+++ b/app/assets/javascripts/UIModels/AppState/FeaturesState.ts
@@ -76,7 +76,7 @@ export class FeaturesState {
   }
 
   private isEntitledToFilesBeta(): boolean {
-    if (window.enabledUnfinishedFeatures) {
+    if (isDev && this.application.hasAccount()) {
       return true
     }