diff --git a/ui/templates/default/list/editItem.html b/ui/templates/default/list/editItem.html
index 0dfe4450..0ff8ba32 100644
--- a/ui/templates/default/list/editItem.html
+++ b/ui/templates/default/list/editItem.html
@@ -3,22 +3,22 @@
 {% block banner %}
   <div class='playlistBanner'>&nbsp;Editing highlighted item</div>
   <input type='hidden' id='track-id' value='{{ entry.getId() }}' />
-{% if entry.getType() == constant('TYPE_SET_SEPARATOR', entry) %}
-{% set type='set-separator' %}
-{% elseif entry.getType() == constant('TYPE_COMMENT', entry) %}
-{% set type='comment-entry' %}
+{% set type = entry.getType() %}
+{% if type is constant('TYPE_SPIN', entry) %}
+  {%~ set etype = 'manual-entry' %}
+  {%~ set album = entry.asArray() %}
+  {%~ for field in ['tag', 'artist', 'album', 'label', 'title'] %}
+  <input type='hidden' id='old-track-{{ field }}' value='{{ album[field == 'title' ? 'track' : field ] }}' />
+  {%~ endfor %}
+{% elseif type is constant('TYPE_COMMENT', entry) %}
+  {%~ set etype = 'comment-entry' %}
   <input type='hidden' id='old-comment-data' value='{{ entry.getComment() }}' />
-{% elseif entry.getType() == constant('TYPE_LOG_EVENT', entry) %}
-{% set type=NME_PREFIX ~ entry.getLogEventType() %}
+{% elseif type is constant('TYPE_LOG_EVENT', entry) %}
+  {%~ set etype = NME_PREFIX ~ entry.getLogEventType() %}
   <input type='hidden' id='old-event-code' value='{{ entry.getLogEventCode() }}' />
 {% else %}
-{% set type='manual-entry' %}
-{% set album = entry.asArray() %}
-{% for field in ['tag', 'artist', 'album', 'label', 'title'] %}
-  <input type='hidden' id='old-track-{{ field }}' value='{{ album[field == 'title' ? 'track' : field ] }}' />
-{% endfor %}
+  {%~ set etype = 'set-separator' %}
 {% endif %}
-
   <input type='hidden' id='old-created' value='{{ entry.getCreatedTime() }}' />
-  <input type='hidden' id='edit-type' value='{{ type }}' />
+  <input type='hidden' id='edit-type' value='{{ etype }}' />
 {% endblock %}
diff --git a/ui/templates/default/list/editor.html b/ui/templates/default/list/editor.html
index 3ca2bbc8..692b51bf 100644
--- a/ui/templates/default/list/editor.html
+++ b/ui/templates/default/list/editor.html
@@ -4,13 +4,13 @@
 {% set djName = playlist.airname ?? "None" %}
 {% set djLink = djId ? "<a href='?subaction=viewDJ&amp;seq=selUser&amp;viewuser=" ~ djId ~ "' class='nav2'>" ~ djName | e ~ "</a>" : djName | e %}
 
-<div class='playlistBanner'><span id='banner-caption'>&nbsp;<span id='banner-description'>{{ showName }}</span> <span id='banner-dj'>with {{ djLink | raw }}</span></span><div>{{ showDateTime }}
+  <div class='playlistBanner'><span id='banner-caption'>&nbsp;<span id='banner-description'>{{ showName }}</span> <span id='banner-dj'>with {{ djLink | raw }}</span></span><div>{{ showDateTime }}
 {%- if not editMode and app.session.isAuth('v') -%}
 &nbsp;<a href='javascript:document.duplist.submit();' title='Duplicate Playlist'><span class='fas fa-clone dup-playlist'></span></a><form name='duplist' action='?' method='POST'><input type='hidden' name='subaction' value='editList'><input type='hidden' name='duplicate' value='1'><input type='hidden' name='playlist' value='{{ playlist.id }}'></form>"
 {%- endif -%}
 &nbsp;</div></div>
 
-<script><!--
+  <script><!--
 {#
    Truncate the show name (banner-description) so that the combined
    show name, DJ name, and date/time fit on one line.
@@ -30,12 +30,12 @@
       });
   });
   // -->
-</script>
+  </script>
 {% endblock %}
 {#--------------------------------------------------------------------------#}
 {% block entry %}
 {% set isLiveShow = not editTrack and isLive %}
-<div class='pl-form-entry form-entry'>
+  <div class='pl-form-entry form-entry'>
     <input id='show-time' type='hidden' value="{{ playlist.showtime }}" >
     {#~ TZO is server equivalent of javascript Date.getTimezoneOffset() #}
     <input id='timezone-offset' type='hidden' value="{{ TZO }}" >