diff --git a/static/index.html b/static/index.html
index 3f1a57339..0697b3d9a 100644
--- a/static/index.html
+++ b/static/index.html
@@ -298,6 +298,7 @@ <h3 class="text-center">SSH Connection</h3>
   <div id="tables_context_menu">
     <ul class="dropdown-menu" role="menu">
       <li><a href="#" data-action="copy">Copy Table Name</a></li>
+      <li><a href="#" data-action="analyze">Analyze Table</a></li>
       <li class="divider"></li>
       <li><a href="#" data-action="export" data-format="json">Export to JSON</a></li>
       <li><a href="#" data-action="export" data-format="csv">Export to CSV</a></li>
diff --git a/static/js/app.js b/static/js/app.js
index 7347c5568..b8ad384d1 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -340,6 +340,12 @@ function performTableAction(table, action, el) {
     case "copy":
       copyToClipboard(table.split('.')[1]);
       break;
+    case "analyze":
+      executeQuery("ANALYZE " + table, function(data) {
+        if (data.error) alert(data.error);
+        resetTable();
+      });
+      break;
   }
 }