1 files changed, 5 insertions, 2 deletions
diff --git a/Hotline/macOS/FilesView.swift b/Hotline/macOS/FilesView.swift
index 4498dc9..5d06b02 100644
--- a/Hotline/macOS/FilesView.swift
+++ b/Hotline/macOS/FilesView.swift
@@ -263,7 +263,7 @@ struct FilesView: View {
     if path.isEmpty {
       return "/"
     }
-    return "/" + path.joined(separator: "/") + "/"
+    return path.joined(separator: "/")
   }
     
   private func openPreviewWindow(_ previewInfo: PreviewFileInfo) {
@@ -464,7 +464,10 @@ struct FilesView: View {
             Label("Upload", systemImage: "arrow.up")
           }
           .help("Upload")
-          .disabled(model.access?.contains(.canUploadFiles) != true)
+          .disabled(
+            model.access?.contains(.canUploadFiles) != true ||
+            (model.fileSearchStatus.isActive && !(selection?.isFolder ?? false))
+          )
 
           Button {
             if let selectedFile = selection {