diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index e5290ea8202..6fe551e5136 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -367,6 +367,10 @@
     "message": "Other",
     "description": "Other"
   },
+  "disableGa": {
+    "message": "Disable Google Analytics",
+    "description": "Disable Google Analytics"
+  },
   "rateExtension": {
     "message": "Rate the Extension",
     "description": "Rate the Extension"
diff --git a/src/popup/app/settings/settingsController.js b/src/popup/app/settings/settingsController.js
index 7e4778cd535..bde39604e4d 100644
--- a/src/popup/app/settings/settingsController.js
+++ b/src/popup/app/settings/settingsController.js
@@ -5,6 +5,7 @@
         i18nService) {
         var gaKey = 'disableGa';
 
+        utilsService.initListSectionItemListeners($(document), angular);
         $scope.disableGa = false;
         $scope.i18n = i18nService;
 
@@ -88,11 +89,15 @@
                 }
                 else {
                     // disable
+                    $analytics.eventTrack('Disabled Google Analytics');
                     obj[gaKey] = true;
                 }
 
                 chrome.storage.local.set(obj, function () {
                     $scope.disableGa = obj[gaKey];
+                    if (!obj[gaKey]) {
+                        $analytics.eventTrack('Enabled Google Analytics');
+                    }
                 });
             });
         };
diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index fe83c92e469..948cb0e372e 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -46,7 +46,7 @@
             </div>
             <div class="list-section-items">
                 <div class="list-section-item list-section-item-checkbox">
-                    <label for="ga">Disable Google Analytics</label>
+                    <label for="ga">{{i18n.disableGa}}</label>
                     <input id="ga" type="checkbox" ng-model="disableGa" ng-change="updateGa()">
                 </div>
                 <a class="list-section-item" ui-sref="about({animation: 'in-slide-left'})">
diff --git a/src/services/i18nService.js b/src/services/i18nService.js
index 9b35bda88ae..5d0bcd1adb9 100644
--- a/src/services/i18nService.js
+++ b/src/services/i18nService.js
@@ -88,6 +88,7 @@ function i18nService() {
         togglePassword: chrome.i18n.getMessage('togglePassword'),
         manage: chrome.i18n.getMessage('manage'),
         other: chrome.i18n.getMessage('other'),
+        disableGa: chrome.i18n.getMessage('disableGa'),
         rateExtension: chrome.i18n.getMessage('rateExtension'),
         rateExtensionDesc: chrome.i18n.getMessage('rateExtensionDesc'),
         browserNotSupportClipboard: chrome.i18n.getMessage('browserNotSupportClipboard')