diff --git a/src/theme.scss b/src/theme.scss
index 091bfccfa..e3ef6fb9f 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -126,6 +126,12 @@ input[type="checkbox"] {
     }
 }
 
+.tooltip.long.nowrap {
+    .tooltip-inner {
+        white-space: nowrap;
+    }
+}
+
 .tooltip-inner {
     white-space: nowrap;
     overflow: hidden;
diff --git a/src/views/apps.html b/src/views/apps.html
index 4db47cf40..ba59d8de0 100644
--- a/src/views/apps.html
+++ b/src/views/apps.html
@@ -76,7 +76,7 @@
       <div class="app-grid">
         <div class="grid-item" ng-repeat="app in installedApps | selectedTagFilter:selectedTags | selectedDomainFilter:selectedDomain | orderBy:'location'">
           <a ng-href="{{ app | applicationLink }}" ng-click="user.admin && ((app | installError) === true && showAppConfigure(app, 'debug')) || ((app | appIsInstalledAndHealthy) && app.pendingPostInstallConfirmation && appPostInstallConfirm.show(app))" target="_blank" ng-class="{ 'hand': (app | appIsInstalledAndHealthy) || (app | installError) }">
-            <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}">
+            <div style="background-color: white;" class="highlight grid-item-content" uib-tooltip="{{ app.fqdn }}" tooltip-class="long nowrap">
               <div class="grid-item-top">
                 <div class="row">
                   <div class="col-xs-12 text-center" style="padding-left: 5px; padding-right: 5px;">
@@ -88,7 +88,7 @@
                 <div class="row">
                   <div class="col-xs-12 text-center">
                     <div class="grid-item-top-title" data-fittext>{{ app.label || app.location || app.fqdn }}</div>
-                    <div class="text-muted status" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden" uib-tooltip="{{ app | appProgressMessage }}">
+                    <div class="text-muted status" style="text-overflow: ellipsis; white-space: nowrap; overflow: hidden" uib-tooltip="{{ app | appProgressMessage }}" tooltip-class="long nowrap">
                       {{ app | installationStateLabel:user }}
                     </div>
                     <div class="status" ng-style="{ 'visibility': user.admin && (app | installationActive) ? 'visible' : 'hidden' }">