diff --git a/rd_ui/app/scripts/controllers/query_view.js b/rd_ui/app/scripts/controllers/query_view.js
index 63a737977..b2a0c41e5 100644
--- a/rd_ui/app/scripts/controllers/query_view.js
+++ b/rd_ui/app/scripts/controllers/query_view.js
@@ -1,12 +1,14 @@
 (function () {
     'use strict';
 
-    var QueryViewCtrl = function ($scope, $window, $route, $http, $location, growl, notifications, Query, Visualization) {
+    var QueryViewCtrl = function ($scope, $window, $route, $http, $location, growl, notifications, Query, Visualization, DataSource) {
         var DEFAULT_TAB = 'table';
         var pristineHash = "";
         var leavingPageText = "You will lose your changes if you leave";
         var route = $route.current;
 
+        $scope.dataSources = DataSource.get();
+
         $scope.dirty = undefined;
         $scope.isNewQuery = false;
         $scope.isOwner = false;
@@ -278,6 +280,7 @@
             'notifications',
             'Query',
             'Visualization',
+            'DataSource',
             QueryViewCtrl
         ]);
 
diff --git a/rd_ui/app/scripts/services/services.js b/rd_ui/app/scripts/services/services.js
index 8d95659a4..53cf156e1 100644
--- a/rd_ui/app/scripts/services/services.js
+++ b/rd_ui/app/scripts/services/services.js
@@ -284,10 +284,10 @@
             return queryResult;
         }
 
-        QueryResult.get = function (query, ttl) {
+        QueryResult.get = function (data_source_id, query, ttl) {
             var queryResult = new QueryResult();
 
-            QueryResultResource.post({'query': query, 'ttl': ttl}, function (response) {
+            QueryResultResource.post({'data_source_id': data_source_id, 'query': query, 'ttl': ttl}, function (response) {
                 queryResult.update(response);
 
                 if ('job' in response) {
@@ -301,7 +301,7 @@
         return QueryResult;
     };
 
-    var Query = function ($resource, QueryResult) {
+    var Query = function ($resource, QueryResult, DataSource) {
         var Query = $resource('/api/queries/:id', {id: '@id'});
 
         Query.prototype.getQueryResult = function(ttl) {
@@ -316,7 +316,7 @@
             } else if (this.latest_query_data_id && ttl != 0) {
                 queryResult = QueryResult.getById(this.latest_query_data_id);
             } else {
-                queryResult = QueryResult.get(this.query, ttl);
+                queryResult = QueryResult.get(this.data_source_id, this.query, ttl);
             }
 
             return queryResult;
@@ -329,7 +329,14 @@
         return Query;
     };
 
+    var DataSource = function($resource) {
+        var DataSourceResource = $resource('/api/data_sources/:id', {id: '@id'}, {'get': {'method': 'GET', 'cache': true, 'isArray': true}});
+
+        return DataSourceResource;
+    }
+
     angular.module('redash.services', [])
         .factory('QueryResult', ['$resource', '$timeout', QueryResult])
-        .factory('Query', ['$resource', 'QueryResult', Query])
+        .factory('Query', ['$resource', 'QueryResult', 'DataSource', Query])
+        .factory('DataSource', ['$resource', DataSource]);
 })();
diff --git a/rd_ui/app/views/queryview.html b/rd_ui/app/views/queryview.html
index 0e584b24b..db3bfd088 100644
--- a/rd_ui/app/views/queryview.html
+++ b/rd_ui/app/views/queryview.html
@@ -112,6 +112,12 @@
                 <select ng-disabled="!isOwner" ng-model="query.ttl" ng-change="saveQuery()" ng-options="c.value as c.name for c in refreshOptions"></select>
             </p>
 
+            <p>
+                <span class="glyphicon glyphicon-hdd"></span>
+                <span class="text-muted">Data Source</span>
+                <select ng-disabled="!isOwner" ng-model="query.data_source_id" ng-options="ds.id as ds.name for ds in dataSources"></select>
+            </p>
+
             <hr>
 
             <p>