diff --git a/webadmin/src/views/appstore.html b/webadmin/src/views/appstore.html
index fdd23b166..1d5572655 100644
--- a/webadmin/src/views/appstore.html
+++ b/webadmin/src/views/appstore.html
@@ -21,8 +21,16 @@
                             <label class="control-label" for="appInstallLocationInput">Location {{ appInstall.error.location }} </label>
                             <div class="input-group form-inline">
                                 <input type="text" class="form-control" ng-model="appInstall.location" id="appInstallLocationInput" name="location" placeholder="Leave empty to use bare domain" autofocus>
-                                <div class="input-group-addon">
-                                    {{ !appInstall.location ? '' : (config.isCustomDomain ? '.' : '-') }}{{ config.fqdn }}
+                                <div class="input-group-btn">
+                                    <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                        {{ (config.isCustomDomain ? '.' : '-') + appInstall.domain }}
+                                        <span class="caret"></span>
+                                    </button>
+                                    <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                                        <li ng-repeat="domain in domains">
+                                            <a href="" ng-click="appInstall.domain = domain">{{ domain }}</a>
+                                        </li>
+                                    </ul>
                                 </div>
                             </div>
                         </div>
diff --git a/webadmin/src/views/appstore.js b/webadmin/src/views/appstore.js
index 1b2ceb9e8..3d0d10770 100644
--- a/webadmin/src/views/appstore.js
+++ b/webadmin/src/views/appstore.js
@@ -12,7 +12,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
     $scope.user = Client.getUserInfo();
     $scope.users = [];
     $scope.groups = [];
-    $scope.dnsConfig = {};
+    $scope.domains = [];
     $scope.category = '';
     $scope.cachedCategory = ''; // used to cache the selected category while searching
     $scope.searchString = '';
@@ -496,14 +496,14 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
         });
     }
 
-    function fetchDnsConfig() {
-        Client.getDnsConfig(function (error, result) {
+    function getDomains() {
+        Client.getDomains(function (error, result) {
             if (error) {
                 console.error(error);
-                return $timeout(fetchDnsConfig, 5000);
+                return $timeout(getDomains, 5000);
             }
 
-            $scope.dnsConfig = result;
+            $scope.domains = result.map(function (d) { return d.domain; });
         });
     }
 
@@ -561,7 +561,7 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
 
             fetchUsers();
             fetchGroups();
-            fetchDnsConfig();
+            getDomains();
             getMailConfig();
 
             fetchAppstoreConfig(function (error) {