diff --git a/gui/default/index.html b/gui/default/index.html
index 7cbc90e7..f4a13660 100644
--- a/gui/default/index.html
+++ b/gui/default/index.html
@@ -539,7 +539,7 @@
                     </tr>
                     <tr ng-if="deviceFolders(deviceCfg).length > 0">
                       <th><span class="fa fa-fw fa-folder"></span>&nbsp;<span translate>Folders</span></th>
-                      <td class="text-right">{{deviceFolders(deviceCfg).join(", ")}}</td>
+                      <td class="text-right">{{deviceFolders(deviceCfg).map(folderLabel).join(", ")}}</td>
                     </tr>
                   </tbody>
                 </table>
diff --git a/gui/default/syncthing/core/syncthingController.js b/gui/default/syncthing/core/syncthingController.js
index 0d058c5d..8ac4b177 100755
--- a/gui/default/syncthing/core/syncthingController.js
+++ b/gui/default/syncthing/core/syncthingController.js
@@ -784,7 +784,7 @@ angular.module('syncthing.core')
             var syncCount = 0;
             var notifyCount = 0;
             var pauseCount = 0;
-            
+
             // loop through all folders
             var folderListCache = $scope.folderList();
             for (var i = 0; i < folderListCache.length; i++) {
@@ -835,12 +835,12 @@ angular.module('syncthing.core')
             if (notifyCount > 0) {
                 return 'notify';
             }
-            
+
             // all used devices are paused except (this) one
             if (pauseCount === deviceCount-1) {
                 return 'pause';
             }
-            
+
             return 'default';
         };
 
@@ -1406,8 +1406,7 @@ angular.module('syncthing.core')
                 var devices = $scope.folders[folderID].devices;
                 for (var i = 0; i < devices.length; i++) {
                     if (devices[i].deviceID === deviceCfg.deviceID) {
-                        var label = $scope.folders[folderID].label;
-                        folders.push(label.length > 0 ? label : folderID);
+                        folders.push(folderID);
                         break;
                     }
                 }
@@ -1417,6 +1416,11 @@ angular.module('syncthing.core')
             return folders;
         };
 
+        $scope.folderLabel = function (folderID) {
+            var label = $scope.folders[folderID].label;
+            return label.length > 0 ? label : folderID;
+        }
+
         $scope.deleteFolder = function (id) {
             $('#editFolder').modal('hide');
             if (!$scope.editingExisting) {