diff --git a/app.py b/app.py
index 506b933..4b4bd54 100644
--- a/app.py
+++ b/app.py
@@ -145,6 +145,7 @@ def admin_edit(link_id=None):
 
     if link_id:
         link = AnimeLink.query.filter_by(id=link_id).first()
+        form.folder.data = link.title.folder.id
     else:
         link = AnimeLink()
         for attr in dir(link):
diff --git a/templates/admin/edit.html b/templates/admin/edit.html
index 06880b7..af96e40 100644
--- a/templates/admin/edit.html
+++ b/templates/admin/edit.html
@@ -10,7 +10,7 @@
                 <div class="field column">
                     <div class="control is-expanded">
                         <div class="select is-fullwidth">
-                            {{ action_form.folder(value=link.title.folder.id) }}
+                            {{ action_form.folder }}
                         </div>
                     </div>
                 </div>