diff --git a/console/.gitignore b/console/.gitignore
index c36cdf8e2fa79..672e4687ff38d 100644
--- a/console/.gitignore
+++ b/console/.gitignore
@@ -10,3 +10,5 @@ npm-debug.log
 *.swp
 coverage
 .idea/*
+test
+**/.tern-port
diff --git a/console/src/components/Services/Data/TablePermissions/Permissions.js b/console/src/components/Services/Data/TablePermissions/Permissions.js
index e067d7c9f24f6..6eb7a978c4a87 100644
--- a/console/src/components/Services/Data/TablePermissions/Permissions.js
+++ b/console/src/components/Services/Data/TablePermissions/Permissions.js
@@ -208,21 +208,21 @@ class Permissions extends Component {
         const bulkSelect = permsState.bulkSelect;
         const currentInputSelection = bulkSelect.filter(e => e === role)
           .length ? (
-            <input
-              onChange={dispatchBulkSelect}
-              checked="checked"
-              data-role={role}
-              className={styles.bulkSelect}
-              type="checkbox"
-            />
-          ) : (
-            <input
-              onChange={dispatchBulkSelect}
-              data-role={role}
-              className={styles.bulkSelect}
-              type="checkbox"
-            />
-          );
+          <input
+            onChange={dispatchBulkSelect}
+            checked="checked"
+            data-role={role}
+            className={styles.bulkSelect}
+            type="checkbox"
+          />
+        ) : (
+          <input
+            onChange={dispatchBulkSelect}
+            data-role={role}
+            className={styles.bulkSelect}
+            type="checkbox"
+          />
+        );
         _permissionsRowHtml.push(
           <td key={-1}>
             <div>
@@ -420,6 +420,13 @@ class Permissions extends Component {
           ? permsState.insert.allow_upsert
           : false;
 
+        // Upsert Tooltip
+        const upsertToolTip = (
+          <Tooltip id="tooltip-upsert">
+            Upsert updates a row if it already exists, otherwise inserts it
+          </Tooltip>
+        );
+
         // TODO: Fix the controlled component
         _upsertSection = (
           <div>
@@ -433,7 +440,10 @@ class Permissions extends Component {
                   onClick={e => dispatchToggleAllowUpsert(e.target.checked)}
                 />
                 <span className={styles.mar_left}>
-                  Allow role '{permsState.role}' to make upsert queries
+                  Allow role '{permsState.role}' to make upsert queries &nbsp;
+                  <OverlayTrigger placement="right" overlay={upsertToolTip}>
+                    <i className="fa fa-question-circle" aria-hidden="true" />
+                  </OverlayTrigger>
                 </span>
               </label>
             </div>