diff --git a/src/public/javascripts/dialogs/sql_console.js b/src/public/javascripts/dialogs/sql_console.js
index 19698b385..366d69d3e 100644
--- a/src/public/javascripts/dialogs/sql_console.js
+++ b/src/public/javascripts/dialogs/sql_console.js
@@ -13,38 +13,15 @@ let codeEditor;
 
 $dialog.on("shown.bs.modal", e => initEditor());
 
-function showDialog() {
+async function showDialog() {
     glob.activeDialog = $dialog;
 
+    await showTables();
+
     $dialog.modal();
 }
 
 async function initEditor() {
-    server.get('sql/schema').then(tables => {
-        $tables.empty();
-
-        for (const table of tables) {
-            const $tableLink = $('<a href="javascript:">').text(table.name);
-
-            const $columns = $("<table>");
-
-            for (const column of table.columns) {
-                $columns.append(
-                    $("<tr>")
-                        .append($("<td>").text(column.name))
-                        .append($("<td>").text(column.type))
-                );
-            }
-
-            $tableLink
-                .attr("title", $columns.html())
-                .tooltip({ html: true })
-                .click(() => codeEditor.setValue("SELECT * FROM " + table.name + " LIMIT 100"));
-
-            $tables.append($tableLink).append(" ");
-        }
-    });
-
     if (!codeEditor) {
         await libraryLoader.requireLibrary(libraryLoader.CODE_MIRROR);
 
@@ -121,6 +98,32 @@ async function execute(e) {
     }
 }
 
+async function showTables() {
+    const tables = await server.get('sql/schema');
+
+    $tables.empty();
+
+    for (const table of tables) {
+        const $tableLink = $('<button class="btn">').text(table.name);
+
+        const $columns = $("<table>");
+
+        for (const column of table.columns) {
+            $columns.append(
+                $("<tr>")
+                    .append($("<td>").text(column.name))
+                    .append($("<td>").text(column.type))
+            );
+        }
+
+        $tables.append($tableLink).append(" ");
+
+        $tableLink
+            .tooltip({html: true, title: $columns.html()})
+            .click(() => codeEditor.setValue("SELECT * FROM " + table.name + " LIMIT 100"));
+    }
+}
+
 $query.bind('keydown', 'ctrl+return', execute);
 
 $executeButton.click(execute);
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index c77af8cef..f15589773 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -893,4 +893,11 @@ div[data-notify="container"] {
     background-color: var(--accented-background-color);
     border: 1px solid var(--main-border-color);
     padding: 2px;
+}
+
+#sql-console-tables button {
+    padding: 0.25rem 0.4rem;
+    font-size: 0.875rem;
+    line-height: 0.5;
+    border-radius: 0.2rem;
 }
\ No newline at end of file