diff --git a/Secretive/Views/ContentView.swift b/Secretive/Views/ContentView.swift
index eec1628..bc76728 100644
--- a/Secretive/Views/ContentView.swift
+++ b/Secretive/Views/ContentView.swift
@@ -23,11 +23,6 @@ struct ContentView<UpdaterType: UpdaterProtocol, AgentStatusCheckerType: AgentSt
                 NoStoresView()
             }
         }
-        .sheet(isPresented: $showingCreation) {
-            if let modifiable = storeList.modifiableStore {
-                CreateSecretView(store: modifiable, showing: $showingCreation)
-            }
-        }
         .frame(minWidth: 640, minHeight: 320)
         .toolbar {
             updateNotice
@@ -83,6 +78,12 @@ extension ContentView {
                 }, label: {
                     Image(systemName: "plus")
                 })
+                .popover(isPresented: $showingCreation, attachmentAnchor: .point(.bottom), arrowEdge: .bottom) {
+                    if let modifiable = storeList.modifiableStore {
+                        CreateSecretView(store: modifiable, showing: $showingCreation)
+                    }
+                }
+
             )
         }
     }
diff --git a/Secretive/Views/SecretListView.swift b/Secretive/Views/SecretListView.swift
index 34268a4..27104d2 100644
--- a/Secretive/Views/SecretListView.swift
+++ b/Secretive/Views/SecretListView.swift
@@ -20,7 +20,7 @@ struct SecretListView: View {
                     }
                 }
             }
-            .sheet(item: $deletingSecret) { secret in
+            .popover(isPresented: .constant(deletingSecret == secret)) {
                 if let modifiable = store as? AnySecretStoreModifiable {
                     DeleteSecretView(store: modifiable, secret: secret) { deleted in
                         deletingSecret = nil
@@ -30,6 +30,7 @@ struct SecretListView: View {
                     }
                 }
             }
+
         }
     }