diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
index 09dc82b52d..60ced2786b 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
@@ -706,6 +706,10 @@ fieldset {
                 text-align: left;
             }
         }
+
+        .action {
+            margin-left: 1em;
+        }
     }
 
     &.rows {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
index 78a6a666fe..b323b4ccdc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-home.tt
@@ -21,7 +21,7 @@
 				<fieldset class="brief">
 				<ol>
 					<li><label for="barcode">Barcode: </label>
-					<input type="text" name="barcode" id="barcode" class="focus" />
+                        <input type="text" name="barcode" id="barcode" class="focus" required="required" />
 					</li>
 				</ol>
 				<fieldset class="action"><input type="submit" value="View spine label" /></fieldset>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
index 089a94d95b..55fb795de0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
@@ -15,34 +15,39 @@
 
 	[% IF ( BarcodeNotFound ) %]
 		<body id="labels_spinelabel-print" class="tools labels">
-            <p>The barcode [% Barcode | html %] was not found.</p>
-            <p><a href="spinelabel-home.pl">Return to spine label printer</a></p>
+            <div class="dialog message">The barcode [% Barcode | html %] was not found.</div>
+            <div id="print_button" class="noprint">
+                <button class="btn btn-default close-window">Close</button>
+            </div>
 	[% ELSE %]
             <body id="labels_spinelabel-print" class="tools labels">
             <div id="spinelabel">
 				[% content | $raw %]
             </div>
             <div id="print_button" class="noprint">
-                <button class="btn btn-default print-label" onclick="window.print()"><i class="fa fa-print"></i> Print this label</button>
+                <button class="btn btn-default print-label"><i class="fa fa-print"></i> Print this label</button>
             </div>
 	[% END %]
 
-[% IF ( IntranetUserJS ) %]
-    [% Asset.js( "lib/jquery/jquery-2.2.3.min.js" ) | $raw %]
-    [% Asset.js( "lib/jquery/jquery-migrate-1.3.0.min.js" ) | $raw %]
-    [% IF ( autoprint ) %]
-        [% INCLUDE 'slip-print.inc' #printThenClose %]
-    [% END %]
-    <script>
-        [% IntranetUserJS | $raw %]
-        $(document).ready(function(){
-            $(".print-label").on("click", function(e){
-                e.preventDefault();
-                window.print();
-                window.close();
-            });
-        });
-    </script>
+[% Asset.js( "lib/jquery/jquery-2.2.3.min.js" ) | $raw %]
+[% Asset.js( "lib/jquery/jquery-migrate-1.3.0.min.js" ) | $raw %]
+[% IF ( autoprint ) %]
+    [% INCLUDE 'slip-print.inc' #printThenClose %]
 [% END %]
+<script>
+    [% IntranetUserJS | $raw %]
+    $(document).ready(function(){
+        $(".print-label").on("click", function(e){
+            e.preventDefault();
+            window.print();
+            window.close();
+        });
+
+        $(".close-window").on("click", function(e){
+            e.preventDefault();
+            window.close();
+        });
+    });
+</script>
 
 [% INCLUDE 'popup-bottom.inc' %]