diff --git a/InvenTree/templates/InvenTree/settings/setting.html b/InvenTree/templates/InvenTree/settings/setting.html
index dc15760ef5..743e37bf8e 100644
--- a/InvenTree/templates/InvenTree/settings/setting.html
+++ b/InvenTree/templates/InvenTree/settings/setting.html
@@ -16,6 +16,9 @@
         {% endif %}
     </td>
     <td><strong>{{ setting.name }}</strong></td>
+    <td>
+        {{ setting.description }}
+    </td>
     <td>
         {% if setting.is_bool %}
         <div class='form-check form-switch'>
@@ -31,18 +34,12 @@
                 {% endif %}
             </span>
             {{ setting.units }}
-        </div>
-        {% endif %}
-    <td>
-        {{ setting.description }}
-    </td>
-    <td>
-        {% if not setting.is_bool %}
-        <div class='btn-group float-right'>
-            <button class='btn btn-outline-secondary btn-small btn-edit-setting' pk='{{ setting.pk }}' setting='{{ setting.key.upper }}' title='{% trans "Edit setting" %}' {% if plugin %}plugin='{{ plugin.pk }}'{% endif %}{% if user_setting %}user='{{request.user.id}}'{% endif %}>
-                <span class='fas fa-edit icon-green'></span>
-            </button>
+            <div class='btn-group float-right'>
+                <button class='btn btn-outline-secondary btn-small btn-edit-setting' pk='{{ setting.pk }}' setting='{{ setting.key.upper }}' title='{% trans "Edit setting" %}' {% if plugin %}plugin='{{ plugin.pk }}'{% endif %}{% if user_setting %}user='{{request.user.id}}'{% endif %}>
+                    <span class='fas fa-edit icon-green'></span>
+                </button>
+            </div>
         </div>
         {% endif %}
     </td>
-</tr>
\ No newline at end of file
+</tr>