diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index d95b0b76db..7ca4f681fb 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -220,7 +220,7 @@ <h3>
               <!-- End of Query Execution Status -->
 
               <!-- tabs and data -->
-              <div ng-if="showDataset" class="flex-fill p-relative">
+              <div ng-if="showDataset && !dataSourceChanged" class="flex-fill p-relative">
                 <div class="d-flex flex-column p-absolute static-position__mobile" style="left: 0; top: 0; right: 0; bottom: 0;">
                   <div class="p-10" ng-show="showLog">
                     <p>Log Information:</p>
diff --git a/client/app/pages/queries/view.js b/client/app/pages/queries/view.js
index bd4aab4eb5..de38d6ff74 100644
--- a/client/app/pages/queries/view.js
+++ b/client/app/pages/queries/view.js
@@ -132,6 +132,7 @@ function QueryViewCtrl(
     Notifications.getPermissions();
   };
 
+  $scope.dataSourceChanged = false;
   $scope.selectedTab = DEFAULT_TAB;
   $scope.currentUser = currentUser;
   $scope.dataSource = {};
@@ -351,7 +352,7 @@ function QueryViewCtrl(
 
     $scope.dataSource = find($scope.dataSources, ds => ds.id === $scope.query.data_source_id);
     getSchema();
-    $scope.executeQuery();
+    $scope.dataSourceChanged = true;
   };
 
   $scope.setVisualizationTab = (visualization) => {