diff --git a/web/app/assets/javascripts/clientUpdate.js b/web/app/assets/javascripts/clientUpdate.js
index ca5bdd428..dd3142e76 100644
--- a/web/app/assets/javascripts/clientUpdate.js
+++ b/web/app/assets/javascripts/clientUpdate.js
@@ -61,7 +61,10 @@
         })
       }
 
-      app.layout.showDialog('client-update')
+      if(!app.layout.isDialogShowing('client-update')) {
+        app.layout.showDialog('client-update')
+      }
+
       //$('#client_update').show()
       //$('#client_update_overlay').show()
     }
@@ -192,6 +195,11 @@
 
     function runCheck(product, version, uri, size, currentVersion) {
 
+      if (app.clientUpdating) {
+        logger.debug("client is already updating; skipping")
+        return
+      }
+
       if(currentVersion === undefined) {
         currentVersion = context.jamClient.ClientUpdateVersion();
 
@@ -302,7 +310,7 @@
 
       $(document).on(EVENTS.SESSION_ENDED, function(e, data){
         if(app.clientUpdating) {
-          updateClientUpdateDialog("update-start", { uri: updateUri })
+          updateClientUpdateDialog("update-start", { uri: updateUri})
         }
       });