diff --git a/client/app/assets/less/redash/query.less b/client/app/assets/less/redash/query.less
index 621630ebd3..83ca054291 100644
--- a/client/app/assets/less/redash/query.less
+++ b/client/app/assets/less/redash/query.less
@@ -468,6 +468,7 @@ a.label-tag {
 
 .datasource-small {
   visibility: hidden;
+  display: none !important;
 }
 
 .query-fullscreen .query-metadata__mobile {
@@ -594,6 +595,11 @@ nav .rg-bottom {
     display: none;
   }
 
+  .datasource-small {
+    visibility: visible;
+    display: inline-block !important;
+  }
+
   .query-fullscreen {
     flex-direction: column;
     overflow: hidden;
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index 3f60a1bb81..053d46848c 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -96,6 +96,8 @@ <h3>
             <img ng-src="/static/images/db-logos/{{ds.type}}.png" width="20" height="20" class="m-r-5">{{ds.name}}
           </ui-select-choices>
         </ui-select>
+        <datasource-link datasource-id="query.data_source_id"></datasource-link>
+        <datasource-version datasource-id="query.data_source_id"></datasource-version>
       </div>
 
       <div class="editor__left__schema" ng-if="sourceMode">