diff --git a/web/skins/classic/css/base/views/controlcaps.css b/web/skins/classic/css/base/views/controlcaps.css
index d860d88ae..f0e566958 100644
--- a/web/skins/classic/css/base/views/controlcaps.css
+++ b/web/skins/classic/css/base/views/controlcaps.css
@@ -7,3 +7,7 @@
     text-align: center;
 }
 
+#controls {
+  height: 100%;
+  overflow-y: auto;
+}
diff --git a/web/skins/classic/views/controlcaps.php b/web/skins/classic/views/controlcaps.php
index a19f0e781..728f5931a 100644
--- a/web/skins/classic/views/controlcaps.php
+++ b/web/skins/classic/views/controlcaps.php
@@ -28,9 +28,9 @@ $controls = dbFetchAll('SELECT * FROM Controls ORDER BY Name');
 $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('ControlCaps'));
+getBodyTopHTML();
+echo getNavBarHTML();
 ?>
-<body>
-  <?php echo getNavBarHTML() ?>
   <div id="page">
 
     <!-- Toolbar button placement and styling handled by bootstrap-tables -->
@@ -43,6 +43,7 @@ xhtmlHeaders(__FILE__, translate('ControlCaps'));
     </div>
 
     <div id="content" class="table-responsive-sm">
+      <div id="controls">
         <table
           id="controlTable"
           data-locale="<?php echo i18n() ?>"
@@ -95,6 +96,7 @@ foreach( $controls as $control ) {
 ?>
           </tbody>
         </table>
+      </div><!--controls-->
     </div>
   </div>
 <?php xhtmlFooter() ?>
