diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
index c5e53d34ef..a7fa1a488d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tt
@@ -72,7 +72,7 @@
                         <h1>New label layout</h1>
                     [% END %]
 
-                    <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="get">
+                    <form name="input" action="/cgi-bin/koha/labels/label-edit-layout.pl" method="post">
                         <fieldset class="rows">
                             <ol>
                                 <li>
@@ -213,10 +213,11 @@
                             </ol>
                         </fieldset>
                         <fieldset class="action">
+                            [% INCLUDE 'csrf-token.inc' %] 
+                            <input type="hidden" name="op" value="cud-save" />
+                            <input type="hidden" name="layout_id" value="[% layout_id | html %]" />
                             <input type="submit" class="btn btn-primary" value="Save" />
                             <a class="cancel" href="/cgi-bin/koha/labels/label-manage.pl?label_element=layout">Cancel</a>
-                            <input type="hidden" name="op" value="save" />
-                            <input type="hidden" name="layout_id" value="[% layout_id | html %]" />
                         </fieldset>
                     </form>
             </main>
diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl
index 1904a49e33..633475caa2 100755
--- a/labels/label-edit-layout.pl
+++ b/labels/label-edit-layout.pl
@@ -86,7 +86,7 @@ sub _select_format_string {     # generate field table based on format_string
     return (\@fields, $field_count);
 }
 
-if ($op eq 'cud-edit') {
+if ($op eq 'edit') {
     warn sprintf("Error performing '%s': No 'layout_id' passed in.", $op) unless ($layout_id);
     $layout = C4::Labels::Layout->retrieve(layout_id => $layout_id);