diff --git a/rd_ui/app/scripts/directives/query_directives.js b/rd_ui/app/scripts/directives/query_directives.js
index e4ce2a4a..68beea90 100644
--- a/rd_ui/app/scripts/directives/query_directives.js
+++ b/rd_ui/app/scripts/directives/query_directives.js
@@ -117,6 +117,8 @@
                 $scope.query.query = newValue;
               });
             }
+
+            $('.schema-container').css('height', $('.CodeMirror').css('height'));
           });
 
           $scope.$watch('query.query', function () {
diff --git a/rd_ui/app/styles/redash.css b/rd_ui/app/styles/redash.css
index 1e3e03fd..b80566a7 100644
--- a/rd_ui/app/styles/redash.css
+++ b/rd_ui/app/styles/redash.css
@@ -156,7 +156,7 @@ li.widget:hover {
 /* CodeMirror */
 .CodeMirror {
     border: 1px solid #eee;
-    /*height: auto;*/
+    height: auto;
     min-height: 300px;
     margin-bottom: 10px;
 }
@@ -308,8 +308,12 @@ counter-renderer counter-name {
     height: 100%;
 }
 
-.schema-browser {
+.schema-container {
     height: 300px;
+}
+
+.schema-browser {
+    height: 100%;
     overflow-y: auto;
     overflow-x: hidden;
 }
diff --git a/rd_ui/app/views/query.html b/rd_ui/app/views/query.html
index 781a93c8..85caee9d 100644
--- a/rd_ui/app/views/query.html
+++ b/rd_ui/app/views/query.html
@@ -83,7 +83,7 @@
                 </p>
             </div>
         </div>
-        <div class="col-md-3" ng-show="hasSchema">
+        <div class="col-md-3 schema-container" ng-show="hasSchema">
             <div>
                 <input type="text" placeholder="Search schema..." class="form-control" ng-model="schemaFilter">
             </div>