diff --git a/client/app/components/queries/schema-browser.html b/client/app/components/queries/schema-browser.html
index a98e27aec6..b7bd0e4442 100644
--- a/client/app/components/queries/schema-browser.html
+++ b/client/app/components/queries/schema-browser.html
@@ -6,10 +6,18 @@
             ng-click="$ctrl.onRefresh()">
       <span class="zmdi zmdi-refresh"></span>
     </button>
+
+    <button class="btn btn-default"
+          title="Toggle Versioned Tables"
+          ng-click="$ctrl.flipToggleVersionedTables($ctrl.versionToggle)">
+    <span class="fa " ng-class="{'fa-toggle-on': $ctrl.versionToggle == true, 'fa-toggle-off': !$ctrl.versionToggle}">
+      <input type="checkbox" id="versioned-tables-toggle" ng-model="$ctrl.versionToggle" hidden/>
+    </span>
+    </button>
   </div>
 
   <div class="schema-browser" vs-repeat vs-size="$ctrl.getSize(table)">
-    <div ng-repeat="table in $ctrl.schema | filter:$ctrl.schemaFilter track by table.name">
+    <div ng-repeat="table in $ctrl.schema | filter:$ctrl.schemaFilter | filter:'!'+$ctrl.versionFilter">
       <div class="table-name" ng-click="$ctrl.showTable(table)">
         <i class="fa fa-table"></i>
         <strong>
diff --git a/client/app/components/queries/schema-browser.js b/client/app/components/queries/schema-browser.js
index 3573cbcf01..cc7e5a6866 100644
--- a/client/app/components/queries/schema-browser.js
+++ b/client/app/components/queries/schema-browser.js
@@ -3,6 +3,9 @@ import template from './schema-browser.html';
 function SchemaBrowserCtrl($rootScope, $scope) {
   'ngInject';
 
+  this.versionToggle = false;
+  this.versionFilter = 'abcdefghijklmnop';
+
   this.showTable = (table) => {
     table.collapsed = !table.collapsed;
     $scope.$broadcast('vsRepeatTrigger');
@@ -20,6 +23,14 @@ function SchemaBrowserCtrl($rootScope, $scope) {
 
   this.isEmpty = function isEmpty() {
     return this.schema === undefined || this.schema.length === 0;
+  this.flipToggleVersionedTables = (versionToggle) => {
+    if (versionToggle === false) {
+      this.versionToggle = true;
+      this.versionFilter = '_v';
+    } else {
+      this.versionToggle = false;
+      this.versionFilter = 'abcdefghijklmnop';
+    }
   };
 
   this.itemSelected = ($event, hierarchy) => {
@@ -33,6 +44,7 @@ const SchemaBrowser = {
   bindings: {
     schema: '<',
     onRefresh: '&',
+    flipToggleVersionedTables: '&',
   },
   controller: SchemaBrowserCtrl,
   template,