diff --git a/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js b/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
index 568450257..5df9da58c 100644
--- a/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
+++ b/guacamole/src/main/webapp/app/manage/controllers/connectionEditModalController.js
@@ -43,12 +43,11 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
     if(!$scope.connection.protocol)
         $scope.connection.protocol = "vnc";
     
-    $scope.historyEntryWrappers = [];
-    
     // Wrap all the history entries
     if (!newConnection) {
 
         connectionService.getConnectionHistory($scope.connection.identifier).success(function wrapHistoryEntries(historyEntries) {
+            $scope.historyEntryWrappers = [];
             historyEntries.forEach(function wrapHistoryEntry(historyEntry) {
                $scope.historyEntryWrappers.push(new HistoryEntryWrapper(historyEntry)); 
             });
@@ -60,6 +59,7 @@ angular.module('manage').controller('connectionEditModalController', ['$scope',
 
     }
     else {
+        $scope.historyEntryWrappers = [];
         $scope.connection.parameters = {};
     }
     
diff --git a/guacamole/src/main/webapp/app/manage/templates/editableConnection.html b/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
index 06c5e3a50..66bcfd576 100644
--- a/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
+++ b/guacamole/src/main/webapp/app/manage/templates/editableConnection.html
@@ -84,13 +84,10 @@ THE SOFTWARE.
             <!-- History connection area -->
             <dt>{{'manage.edit.connection.history.usageHistory' | translate}}</dt>
 
-            <dd ng-hide="connection.history.length">
-              <p>{{'manage.edit.connection.history.connectionNotUsed' | translate}}</p>
-            </dd>
-            
             <!-- History connection list -->
-            <dd ng-show="connection.history.length">
-                <table class="history section">
+            <dd ng-class="{loading: !historyEntryWrappers}">
+                <p ng-hide="historyEntryWrappers.length">{{'manage.edit.connection.history.connectionNotUsed' | translate}}</p>
+                <table class="history section" ng-show="historyEntryWrappers.length">
                     <tr>
                         <th>{{'manage.edit.connection.history.username' | translate}}</th>
                         <th>{{'manage.edit.connection.history.startTime' | translate}}</th>