diff --git a/main.py b/main.py
index 8ce9ad7..011ef31 100644
--- a/main.py
+++ b/main.py
@@ -335,7 +335,12 @@ def pg_dump_file(out_path: Path):
 
 def pg_restore_file(sql_path: Path):
     env = _pg_env()
-    cmd = ["psql", env["PGDBNAME"]]
+    # Drop existing objects to ensure the restore can proceed
+    drop_cmd = ["psql", env["PGDBNAME"], "-c", "DROP SCHEMA IF EXISTS public CASCADE; CREATE SCHEMA public;"]
+    subprocess.run(drop_cmd, check=True, env=env)
+
+    cmd = ["psql", env["PGDBNAME"], "-v", "ON_ERROR_STOP=1"]
+
     with open(sql_path, "r") as fh:
         subprocess.run(cmd, stdin=fh, check=True, env=env)
 
diff --git a/templates/admin.html b/templates/admin.html
index 0f1ddc6..56a7b13 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -70,7 +70,8 @@ <h3>Database Backups</h3>
             <tr>
                 <td>{{ b }}</td>
                 <td>
-                    <form method="post" action="/db_restore">
+                    <form method="post" action="/db_restore" onsubmit="return confirm('Restore from {{ b }}? This will overwrite the current database.');">
+
                         <input type="hidden" name="filename" value="{{ b }}">
                         <button type="submit">Restore</button>
                     </form>