diff --git a/Secretive/Views/ContentView.swift b/Secretive/Views/ContentView.swift
index c68fe42..37d7413 100644
--- a/Secretive/Views/ContentView.swift
+++ b/Secretive/Views/ContentView.swift
@@ -53,8 +53,8 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
                     }
                     .frame(minWidth: 100, idealWidth: 240)
                     .sheet(item: $deletingSecret) { secret in
-                        if storeList.modifiableStore != nil {
-                            DeleteSecretView(secret: secret, store: storeList.modifiableStore!) { deleted in
+                        if let store = storeList.modifiableStore {
+                            DeleteSecretView(secret: secret, store: store) { deleted in
                                 deletingSecret = nil
                                 if deleted {
                                     active = nextDefaultSecret
@@ -63,7 +63,9 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
                         }
                     }
                     .sheet(isPresented: $showingCreation) {
-                        CreateSecretView(showing: $showingCreation)
+                        if let store = storeList.modifiableStore {
+                            CreateSecretView(store: store, showing: $showingCreation)
+                        }
                     }
                 }
             } else {
diff --git a/Secretive/Views/CreateSecretView.swift b/Secretive/Views/CreateSecretView.swift
index 51f661a..613f734 100644
--- a/Secretive/Views/CreateSecretView.swift
+++ b/Secretive/Views/CreateSecretView.swift
@@ -1,13 +1,13 @@
 import SwiftUI
 import SecretKit
 
-struct CreateSecretView: View {
+struct CreateSecretView<StoreType: SecretStoreModifiable>: View {
     
-    @EnvironmentObject var store: AnySecretStoreModifiable
+    @ObservedObject var store: StoreType
+    @Binding var showing: Bool
     
     @State var name = ""
     @State var requiresAuthentication = true
-    @Binding var showing: Bool
 
     var body: some View {
         VStack {