diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
index 117def57c6..e934144631 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-imageviewer.tt
@@ -51,17 +51,17 @@
 
         <div class="container-fluid">
             <div class="row">
+                [% SET column_class = "col order-first order-md-first order-lg-2" %]
                 [% IF ( OpacNav || OpacNavBottom ) %]
+                    [% column_class = "col-10 order-first order-md-first order-lg-2" %]
                     <div class="col-lg-2">
                         <div id="navigation">
                             [% INCLUDE 'navigation.inc' %]
                         </div>
                     </div>
-                    <div class="col-10 order-first order-md-first order-lg-2">
-                [% ELSE %]
-                    <div class="col order-first order-md-first order-lg-2">
                 [% END %]
 
+                <div class="[% column_class | html %]">
                     <div class="row">
                         <div class="col-lg-9 maincontent">
                             <h1 class="title">Images for  [% INCLUDE 'biblio-title.inc' link=> 1 %] [% biblio.author | html %]