diff --git a/libraries/classes/DisplayResults.php b/libraries/classes/DisplayResults.php
index be6e9f8522..3183724d0f 100644
--- a/libraries/classes/DisplayResults.php
+++ b/libraries/classes/DisplayResults.php
@@ -960,7 +960,7 @@ class DisplayResults
         $table_navigation_html .= '</form>'
             . '</td>'
             . '<td class="navigation_separator"></td>'
-            . '<td>'
+            . '<td class="largescreenonly">'
             . '<span>' . __('Filter rows') . ':</span>'
             . '<input type="text" class="filter_rows"'
             . ' placeholder="' . __('Search this table') . '"'
@@ -1899,7 +1899,7 @@ class DisplayResults
                 . '<input type="hidden" name="goto" value="sql.php" />';
         }
 
-        $form_html .= '<table class="table_results data ajax"';
+        $form_html .= '<div class="responsivetable"><table class="table_results data ajax"';
         $form_html .= ' data-uniqueId="' . $this->__get('unique_id') . '"';
         $form_html .= '>';
 
@@ -4437,7 +4437,7 @@ class DisplayResults
 
         $this->__set('display_params', null);
 
-        $table_html .= '</tbody>' . "\n" . '</table>';
+        $table_html .= '</tbody>' . "\n" . '</table></div>';
 
         // 4. ----- Prepares the link for multi-fields edit and delete
 
diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
index 49c5d1f3fe..dae80b36d9 100644
--- a/libraries/controllers/database/DatabaseStructureController.php
+++ b/libraries/controllers/database/DatabaseStructureController.php
@@ -599,7 +599,7 @@ class DatabaseStructureController extends DatabaseController
                 $row_count = 1;
 
                 $this->response->addHTML(
-                    '</tr></tbody></table></form>'
+                    '</tr></tbody></table></div></form>'
                 );
 
                 $this->response->addHTML(
diff --git a/libraries/controllers/server/ServerDatabasesController.php b/libraries/controllers/server/ServerDatabasesController.php
index a0810a51d3..56f363af4a 100644
--- a/libraries/controllers/server/ServerDatabasesController.php
+++ b/libraries/controllers/server/ServerDatabasesController.php
@@ -304,13 +304,13 @@ class ServerDatabasesController extends Controller
         }
 
         // database table
-        $html .= '<table id="tabledatabases" class="data">' . "\n";
+        $html .= '<div class="responsivetable"><table id="tabledatabases" class="data">' . "\n";
         $html .= $this->_getHtmlForTableHeader(
             $_url_params, $column_order, $first_database
         );
         $html .= $this->_getHtmlForTableBody($column_order, $replication_types);
         $html .= $this->_getHtmlForTableFooter($column_order, $first_database);
-        $html .= '</table>' . "\n";
+        $html .= '</table></div>' . "\n";
 
         $html .= $this->_getHtmlForTableFooterButtons();
 
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index f53d45ca32..f7707862bf 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -3484,6 +3484,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
         = '<form name="usersForm" id="usersForm" action="server_privileges.php" '
         . 'method="post">' . "\n"
         . Url::getHiddenInputs('', '')
+        . '<div class="responsivetable">'
         . '<table id="tableuserrights" class="data">' . "\n"
         . '<thead>' . "\n"
         . '<tr><th></th>' . "\n"
@@ -3507,7 +3508,7 @@ function PMA_getUsersOverview($result, $db_rights, $pmaThemeImage, $text_dir)
     $html_output .= '<tbody>' . "\n";
     $html_output .= PMA_getHtmlTableBodyForUserRights($db_rights);
     $html_output .= '</tbody>'
-        . '</table>' . "\n";
+        . '</table></div>' . "\n";
 
     $html_output .= '<div class="floatleft">'
         . Template::get('select_all')
diff --git a/templates/database/structure/table_header.phtml b/templates/database/structure/table_header.phtml
index e1b0ba7277..4d8871aafd 100644
--- a/templates/database/structure/table_header.phtml
+++ b/templates/database/structure/table_header.phtml
@@ -12,6 +12,7 @@ if ($GLOBALS['cfg']['NumFavoriteTables'] > 0) {
 ?>
 <form method="post" action="db_structure.php" name="tablesForm" id="tablesForm">
 <?= PhpMyAdmin\Url::getHiddenInputs($db); ?>
+<div class="responsivetable">
 <table id="structureTable" class="data">
     <thead>
         <tr>
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index eeaee73ba8..92649d0b45 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1124,7 +1124,7 @@ div#tablestatistics table {
     padding: .3em .9em;
     padding-<?php echo $left; ?>: 2.2em;
     text-shadow: 0 1px 0 #000;
-    width: 10000px;
+    width: 100%;
     overflow: hidden;
 }
 
@@ -3527,7 +3527,15 @@ body .ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset {
         display: inline;
     }
 
+    .responsivetable {
+        overflow-x: scroll;
+    }
+
     body#loginform div.container {
         width: 100%;
     }
+
+    .largescreenonly {
+        display: none;
+    }
 }
\ No newline at end of file