diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 810c6c81..ab4d2300 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -457,6 +457,9 @@
     "initialSetupArmingAllowed": {
         "message": "Arming Allowed"
     },
+    "initialSetupArmingDisableFlagsTooltip": {
+        "message": "List of flags indicating why arming is currently not allowed. Please refer to the Wiki for a description of what these flags mean."
+    },
     "initialSetupGPSHead": {
         "message": "GPS"
     },
diff --git a/tabs/setup.html b/tabs/setup.html
index 28981e08..e3ff46e6 100644
--- a/tabs/setup.html
+++ b/tabs/setup.html
@@ -95,7 +95,7 @@
                     <div class="spacer_box">
                         <table width="100%" border="0" cellpadding="0" cellspacing="0" class="cf_table">
                             <tbody>
-                                <tr>
+                                <tr id="arming-disable-flag-row" class="cf_tip">
                                     <td i18n="initialSetupArmingDisableFlags"></td>
                                     <td class="arming-disable-flags">0</td>
                                 </tr>
diff --git a/tabs/setup.js b/tabs/setup.js
index 2460215e..525b39ab 100755
--- a/tabs/setup.js
+++ b/tabs/setup.js
@@ -59,6 +59,9 @@ TABS.setup.initialize = function (callback) {
 
         self.initializeInstruments();
 
+
+        $('#arming-disable-flag-row').attr('title', chrome.i18n.getMessage('initialSetupArmingDisableFlagsTooltip'));
+
         // UI Hooks
         $('a.calibrateAccel').click(function () {
             var self = $(this);