diff --git a/guacamole/src/main/webapp/app/client/types/ManagedClient.js b/guacamole/src/main/webapp/app/client/types/ManagedClient.js
index 3510ae18a..81c30ae57 100644
--- a/guacamole/src/main/webapp/app/client/types/ManagedClient.js
+++ b/guacamole/src/main/webapp/app/client/types/ManagedClient.js
@@ -243,7 +243,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
         
         // Update connection state as tunnel state changes
         tunnel.onstatechange = function tunnelStateChanged(state) {
-            $rootScope.$apply(function updateTunnelState() {
+            $rootScope.$evalAsync(function updateTunnelState() {
                 
                 switch (state) {
 
@@ -269,7 +269,7 @@ angular.module('client').factory('ManagedClient', ['$rootScope', '$injector',
 
         // Update connection state as client state changes
         client.onstatechange = function clientStateChanged(clientState) {
-            $rootScope.$apply(function updateClientState() {
+            $rootScope.$evalAsync(function updateClientState() {
 
                 switch (clientState) {
 
diff --git a/guacamole/src/main/webapp/app/element/directives/guacFocus.js b/guacamole/src/main/webapp/app/element/directives/guacFocus.js
index 693770712..2331bc0e1 100644
--- a/guacamole/src/main/webapp/app/element/directives/guacFocus.js
+++ b/guacamole/src/main/webapp/app/element/directives/guacFocus.js
@@ -23,7 +23,7 @@
 /**
  * A directive which allows elements to be manually focused / blurred.
  */
-angular.module('element').directive('guacFocus', ['$timeout', '$parse', function guacFocus($timeout, $parse) {
+angular.module('element').directive('guacFocus', ['$parse', function guacFocus($parse) {
 
     return {
         restrict: 'A',
@@ -47,7 +47,7 @@ angular.module('element').directive('guacFocus', ['$timeout', '$parse', function
 
             // Set/unset focus depending on value of guacFocus
             $scope.$watch(guacFocus, function updateFocus(value) {
-                $timeout(function updateFocusAsync() {
+                $scope.$evalAsync(function updateFocusAsync() {
                     if (value)
                         element.focus();
                     else
@@ -57,14 +57,14 @@ angular.module('element').directive('guacFocus', ['$timeout', '$parse', function
 
             // Set focus flag when focus is received
             element.addEventListener('focus', function focusReceived() {
-                $scope.$apply(function setGuacFocus() {
+                $scope.$evalAsync(function setGuacFocusAsync() {
                     guacFocus.assign($scope, true);
                 });
             });
 
             // Unset focus flag when focus is lost
             element.addEventListener('blur', function focusLost() {
-                $scope.$apply(function unsetGuacFocus() {
+                $scope.$evalAsync(function unsetGuacFocusAsync() {
                     guacFocus.assign($scope, false);
                 });
             });