diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
index 79687304bf..edc4e9c190 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt
@@ -324,16 +324,14 @@
     [% ELSE # IF op == "show" %]
 
         [% IF op == 'save' %]
-            <div class="main container-fluid">
-                <div class="row">
-                    <div class="col-md-8 offset-md-2">
-                        [% INCLUDE 'messages.inc' %]
+            [% SET div_class = "col-md-8 offset-md-2" %]
         [% ELSE %]
-            <div class="main container-fluid">
-                <div class="row">
-                    <div class="col-md-10 order-md-2 order-sm-1">
-                        [% INCLUDE 'messages.inc' %]
+            [% SET div_class = "col-md-10 order-md-2 order-sm-1" %]
         [% END %]
+        <div class="main container-fluid">
+            <div class="row">
+                <div class="[% div_class | html %]">
+                    [% INCLUDE 'messages.inc' %]
 
         [% IF op == 'save' %]
             [% FOR m IN messages %]
@@ -1041,10 +1039,10 @@
             [% END # /WRAPPER tabs %]
         [% END # /IF op == 'else' %]
 
+        </div> <!-- /.col-md-8.offset-md-2 OR /.col-md-10.order-md-2 -->
+
         [% UNLESS op == 'save' %]
             [% UNLESS ( op == 'show' ) %]
-                </div> <!-- /.col-md-10.order-md-2 -->
-
                 <div class="col-md-2 order-sm-2 order-md-1">
                     <aside>
                         <form name="suggestionfilter" action="suggestion.pl" method="get">