diff --git a/plugins/tables-filter.php b/plugins/tables-filter.php
index ab716531..68b9b809 100644
--- a/plugins/tables-filter.php
+++ b/plugins/tables-filter.php
@@ -54,16 +54,39 @@ function tablesFilterInput() {
 }
 
 sessionStorage && document.addEventListener('DOMContentLoaded', function () {
-	var db = qs('#dbs').querySelector('select');
-	db = db.options[db.selectedIndex].text;
-	if (db == sessionStorage.getItem('adminer_tables_filter_db') && sessionStorage.getItem('adminer_tables_filter')){
-		qs('#filter-field').value = sessionStorage.getItem('adminer_tables_filter');
-		tablesFilter();
+	if (qs('#dbs') != null) {
+		var db = qs('#dbs').querySelector('select');
+		db = db.options[db.selectedIndex].text;
+		if (db == sessionStorage.getItem('adminer_tables_filter_db') && sessionStorage.getItem('adminer_tables_filter')){
+			qs('#filter-field').value = sessionStorage.getItem('adminer_tables_filter');
+			tablesFilter();
+		}
+		sessionStorage.setItem('adminer_tables_filter_db', db);
 	}
-	sessionStorage.setItem('adminer_tables_filter_db', db);
+	document.addEventListener('keyup', function(event) {
+		if (event.ctrlKey && event.shiftKey && event.key == 'F') {
+			qs('#filter-field').focus();
+			return;
+		}
+	});
+	qs('#filter-field').addEventListener('keydown', function(event) {
+		if (event.key == 'Enter' || event.keyCode == 13 || event.which == 13) {
+			event.preventDefault();
+			return false;
+		}
+	});
 });
 </script>
-<p class="jsonly"><input id="filter-field" autocomplete="off"><?php echo script("qs('#filter-field').oninput = tablesFilterInput;"); ?>
+
+<fieldset style="margin-left: .8em;">
+	<legend><?php echo lang('Filter tables'); ?></legend>
+	<div>
+		<input type="search" id="filter-field" autocomplete="off" placeholder="Ctrl + Shift + F"><?php echo script("qs('#filter-field').oninput = tablesFilterInput;"); ?>
+		<input type="button" id="filter-field-reset" value="<?php echo lang('Clear'); ?>">
+		<?php echo script("qs('#filter-field-reset').onclick = function() { qs('#filter-field').value = ''; qs('#filter-field').dispatchEvent(new Event('input')); }"); ?>
+	</div>
+</fieldset>
+
 <?php
 	}
 }