diff --git a/rd_ui/app/views/query.html b/rd_ui/app/views/query.html
index 85caee9d16..966d58ca68 100644
--- a/rd_ui/app/views/query.html
+++ b/rd_ui/app/views/query.html
@@ -92,8 +92,8 @@ <h2>
                     <div class="table-name" ng-click="table.collapsed = !table.collapsed">
                         <i class="fa fa-table"></i> <strong><span title="{{table.name}}">{{table.name}}</span></strong>
                     </div>
-                    <div collapse="table.collapsed">
-                        <div ng-repeat="column in table.columns | filter:schemaFilter" style="padding-left:16px;">{{column}}</div>
+                    <div collapse="table.collapsed && !schemaFilter">
+                        <div ng-repeat="column in table.columns" style="padding-left:16px;">{{column}}</div>
                     </div>
                 </div>
             </div>