diff --git a/python/nav/web/templates/custom_crispy_templates/field_helptext_as_icon.html b/python/nav/web/templates/custom_crispy_templates/field_helptext_as_icon.html
index d7c0a41adb..d20f4f1a11 100644
--- a/python/nav/web/templates/custom_crispy_templates/field_helptext_as_icon.html
+++ b/python/nav/web/templates/custom_crispy_templates/field_helptext_as_icon.html
@@ -1,34 +1,35 @@
 {% load forms %}
+{% spaceless %}
+  {% if field.is_hidden %}
+    {{ field }}
+  {% else %}
+      <div id="div_{{ field.auto_id }}" class="ctrlHolder{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.errors %} error{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
+        {% if field.label %}
+          {% if field|is_checkbox %}
+            {{ field }}
+          {% endif %}
 
-{% if field.is_hidden %}
-  {{ field }}
-{% else %}
-    <div id="div_{{ field.auto_id }}" class="ctrlHolder{% if wrapper_class %} {{ wrapper_class }}{% endif %}{% if field.errors %} error{% endif %}{% if field.css_classes %} {{ field.css_classes }}{% endif %}">
-      {% if field.label %}
-        {% if field|is_checkbox %}
-          {{ field }}
+            <label for="{{ field.id_for_label }}" {% if field.field.required %}class="requiredField"{% endif %}>
+              {{ field.label|safe }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
+              {% if field.help_text %}
+                  &nbsp;<i id="hint_{{ field.auto_id }}" class="fa fa-info-circle" data-tooltip title="
+                  {{ field.help_text }}
+                  "></i>
+              {% endif %}
+            </label>
         {% endif %}
 
-          <label for="{{ field.id_for_label }}" {% if field.field.required %}class="requiredField"{% endif %}>
-            {{ field.label|safe }}{% if field.field.required %}<span class="asteriskField">*</span>{% endif %}
-            {% if field.help_text %}
-                &nbsp;<i id="hint_{{ field.auto_id }}" class="fa fa-info-circle" data-tooltip title="
-                {{ field.help_text }}
-                "></i>
-            {% endif %}
-          </label>
-      {% endif %}
-
-      {% if not field|is_checkbox %}
-        {{ field }}
-      {% endif %}
+        {% if not field|is_checkbox %}
+          {{ field }}
+        {% endif %}
 
-      {% for error in field.errors %}
-        <small id="error_{{ forloop.counter }}_{{ field.auto_id }}"
-               class="errorField">
-          {{ error }}
-        </small>
-      {% endfor %}
+        {% for error in field.errors %}
+          <small id="error_{{ forloop.counter }}_{{ field.auto_id }}"
+                class="errorField">
+            {{ error }}
+          </small>
+        {% endfor %}
 
-    </div>
-{% endif %}
+      </div>
+  {% endif %}
+{% endspaceless %}