diff --git a/Secretive/Views/ContentView.swift b/Secretive/Views/ContentView.swift
index 8da4580..294cb75 100644
--- a/Secretive/Views/ContentView.swift
+++ b/Secretive/Views/ContentView.swift
@@ -74,13 +74,7 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
         .toolbar {
             updateNotice
             agentNotice
-            ToolbarItem {
-                Button(action: {
-                    showingCreation = true
-                }, label: {
-                    Image(systemName: "plus")
-                })
-            }
+            newItem
         }
     }
 
@@ -114,6 +108,19 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
         }
     }
 
+    var newItem: ToolbarItem<Void, AnyView> {
+        guard storeList.modifiableStore?.isAvailable ?? false else {
+            return ToolbarItem { AnyView(Spacer()) }
+        }
+        return ToolbarItem {
+            AnyView(Button(action: {
+                showingCreation = true
+            }, label: {
+                Image(systemName: "plus")
+            }))
+        }
+    }
+
     var agentNotice: ToolbarItem<Void, AnyView> {
         guard agentStatusChecker.running else {
             return ToolbarItem { AnyView(Spacer()) }
diff --git a/Secretive/Views/SetupView.swift b/Secretive/Views/SetupView.swift
index 667ee95..0a98f09 100644
--- a/Secretive/Views/SetupView.swift
+++ b/Secretive/Views/SetupView.swift
@@ -101,7 +101,7 @@ struct SetupStepCommandView: View {
         .background(Color(white: 0, opacity: 0.10))
         .cornerRadius(10)
         .onDrag {
-            return NSItemProvider(item: NSData(data: text.data(using: .utf8)!), typeIdentifier: kUTTypeUTF8PlainText as String)
+            NSItemProvider(item: NSData(data: text.data(using: .utf8)!), typeIdentifier: kUTTypeUTF8PlainText as String)
         }
     }