diff --git a/src/views/apps.html b/src/views/apps.html
index 4e022aa11..ef1b37dbb 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -22,7 +22,7 @@
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                                 <!-- the admin check is to check for spaces user -->
                                                 <span ng-if="user.admin">{{ (!appConfigure.location ? '' : (appConfigure.domain.config.hyphenatedSubdomains ? '-' : '.')) + appConfigure.domain.domain }}</span>
-                                                <span ng-if="!user.admin">{{ (!appConfigure.location ? '' : '-') + spacesSuffix + '.' + appConfigure.domain.domain }}</span>
+                                                <span ng-if="!user.admin">{{ (!appConfigure.location ? '' : '-') + spacesSuffix + (appConfigure.domain.config.hyphenatedSubdomains ? '-' : '.') + appConfigure.domain.domain }}</span>
                                                 <span class="caret"></span>
                                             </button>
                                             <ul class="dropdown-menu dropdown-menu-right" role="menu">
@@ -263,7 +263,7 @@
                               <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                 <!-- the admin check is to check for spaces user -->
                                 <span ng-if="user.admin">{{ (!appRestore.location ? '' : (appRestore.domain.config.hyphenatedSubdomains ? '-' : '.')) + appRestore.domain.domain }}</span>
-                                <span ng-if="!user.admin">{{ (!appRestore.location ? '' : '-') + spacesSuffix + '.' + appRestore.domain.domain }}</span>
+                                <span ng-if="!user.admin">{{ (!appRestore.location ? '' : '-') + spacesSuffix + (appRestore.domain.config.hyphenatedSubdomains ? '-' : '.') + appRestore.domain.domain }}</span>
                                 <span class="caret"></span>
                               </button>
                               <ul class="dropdown-menu dropdown-menu-right" role="menu">
diff --git a/src/views/appstore.html b/src/views/appstore.html
index 7748edde5..75678985d 100644
--- a/src/views/appstore.html
+++ b/src/views/appstore.html
@@ -25,7 +25,7 @@
                                     <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                         <!-- the admin check is to check for spaces user -->
                                         <span ng-if="user.admin">{{ (appInstall.location ? (appInstall.domain.config.hyphenatedSubdomains ? '-' : '.') : '') + appInstall.domain.domain }}</span>
-                                        <span ng-if="!user.admin">{{ (appInstall.location ? '-' : '') + spacesSuffix + '.' + appInstall.domain.domain }}</span>
+                                        <span ng-if="!user.admin">{{ (appInstall.location ? '-' : '') + spacesSuffix + (appInstall.domain.config.hyphenatedSubdomains ? '-' : '.') + appInstall.domain.domain }}</span>
                                         <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu dropdown-menu-right" role="menu">