diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index 440d02826..806301f01 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -29,11 +29,12 @@ $value={{$:/temp/newfieldvalue}}/>
 </$reveal>
 </$vars>
 \end
+\whitespace trim
 
 <div class="tc-edit-fields">
 <table class="tc-edit-fields">
 <tbody>
-<$list filter="[all[current]fields[]] +[sort[title]]" variable="currentField">
+<$list filter="[all[current]fields[]] +[sort[title]]" variable="currentField" storyview="pop">
 <$list filter=<<config-filter>> variable="temp">
 <tr class="tc-edit-field">
 <td class="tc-edit-field-name">