diff --git a/the_works/templates/views/genre.html b/the_works/templates/views/genre.html
index a650964..79fd699 100644
--- a/the_works/templates/views/genre.html
+++ b/the_works/templates/views/genre.html
@@ -32,9 +32,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="genre-modal">
   <article>
-    <form id="genre_detail_form" method="post" >
+    <form id="genre_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="genre-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/herausgeber.html b/the_works/templates/views/herausgeber.html
index 3584dfa..34b0561 100644
--- a/the_works/templates/views/herausgeber.html
+++ b/the_works/templates/views/herausgeber.html
@@ -32,9 +32,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="herausgeber-modal">
   <article>
-    <form id="herausgeber_detail_form" method="post" >
+    <form id="herausgeber_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="herausgeber-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/pseudonym.html b/the_works/templates/views/pseudonym.html
index 15ead25..bdbe716 100644
--- a/the_works/templates/views/pseudonym.html
+++ b/the_works/templates/views/pseudonym.html
@@ -32,9 +32,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="pseudonym-modal">
   <article>
-    <form id="pseudonym_detail_form" method="post" >
+    <form id="pseudonym_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="pseudonym-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/reihe.html b/the_works/templates/views/reihe.html
index 4eb3364..caf573b 100644
--- a/the_works/templates/views/reihe.html
+++ b/the_works/templates/views/reihe.html
@@ -34,9 +34,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="reihe-modal">
   <article>
-    <form id="reihe_detail_form" method="post" >
+    <form id="reihe_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="reihe-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/sprache.html b/the_works/templates/views/sprache.html
index 024a230..9380514 100644
--- a/the_works/templates/views/sprache.html
+++ b/the_works/templates/views/sprache.html
@@ -32,9 +32,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="sprache-modal">
   <article>
-    <form id="sprache_detail_form" method="post" >
+    <form id="sprache_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="sprache-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/textform.html b/the_works/templates/views/textform.html
index 3f0413a..ddcd4fb 100644
--- a/the_works/templates/views/textform.html
+++ b/the_works/templates/views/textform.html
@@ -32,9 +32,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="textform-modal">
   <article>
-    <form id="textform_detail_form" method="post" >
+    <form id="textform_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="textform-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/titelbild.html b/the_works/templates/views/titelbild.html
index 884030d..ba6a1e0 100644
--- a/the_works/templates/views/titelbild.html
+++ b/the_works/templates/views/titelbild.html
@@ -38,9 +38,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="titelbild-modal">
   <article>
-    <form id="titelbild_detail_form" method="post" enctype="multipart/form-data" action="#">
+    <form id="titelbild_detail_form" enctype="multipart/form-data" method="dialog" method="dialog">
       <header>
-        <button aria-label="close" rel="prev"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/verlag.html b/the_works/templates/views/verlag.html
index 5e43bd4..8db5f2d 100644
--- a/the_works/templates/views/verlag.html
+++ b/the_works/templates/views/verlag.html
@@ -32,9 +32,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="verlag-modal">
   <article>
-    <form id="verlag_detail_form" method="post" >
+    <form id="verlag_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="verlag-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/veroeffentlichung.html b/the_works/templates/views/veroeffentlichung.html
index b6aff23..85664f3 100644
--- a/the_works/templates/views/veroeffentlichung.html
+++ b/the_works/templates/views/veroeffentlichung.html
@@ -40,9 +40,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="veroeffentlichung-modal">
   <article>
-    <form id="veroeffentlichung_detail_form" method="post" >
+    <form id="veroeffentlichung_detail_form" method="dialog">
       <header>
-        <button aria-label="close" rel="prev" onclick="veroeffentlichung-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>
 
diff --git a/the_works/templates/views/werk_detail.html b/the_works/templates/views/werk_detail.html
index 4ff971e..5667466 100644
--- a/the_works/templates/views/werk_detail.html
+++ b/the_works/templates/views/werk_detail.html
@@ -188,7 +188,7 @@ Werk bearbeiten
   </footer>
 </form>
 
-<dialog id="imagepreview-modal">
+<dialog id="imagepreview-modal" closedby="any">
   <article>
     <header>
       <button class="modal-close" aria-label="close" rel="prev"></button>
diff --git a/the_works/templates/views/werksform.html b/the_works/templates/views/werksform.html
index 343112a..7d9150c 100644
--- a/the_works/templates/views/werksform.html
+++ b/the_works/templates/views/werksform.html
@@ -32,9 +32,9 @@
 
 <dialog aria-labelledby="dialog-heading" id="werksform-modal">
   <article>
-    <form id="werksform_detail_form" method="post" >
+    <form id="werksform_detail_form" method="dialog" >
       <header>
-        <button aria-label="close" rel="prev" onclick="werksform-modal.close()"></button>
+        <button class="modal-close" aria-label="close" rel="prev" formnovalidate></button>
         <h1 id="dialog-heading">#</h1>
       </header>