diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 4c5d9bf4f0..f20676efc2 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -340,6 +340,7 @@ var toolBar = (function() {
                 Messages.sendLocalMessage("edit-events", JSON.stringify({
                     enabled: active
                 }));
+                UserActivityLogger.logAction("enabled_edit");
                 isActive = active;
                 if (!isActive) {
                     entityListTool.setVisible(false);
@@ -360,9 +361,6 @@ var toolBar = (function() {
                 }
                 that.showTools(isActive);
             }
-            if (active) {
-                UserActivityLogger.logAction("enabled_edit");
-            }
         }
         toolBar.selectTool(activeButton, isActive);
         lightOverlayManager.setVisible(isActive && Menu.isOptionChecked(MENU_SHOW_LIGHTS_IN_EDIT_MODE));