diff --git a/site/plugins/admin/views/partials/base.html b/site/plugins/admin/views/partials/base.html
index 1c4ddf93..aeee5697 100644
--- a/site/plugins/admin/views/partials/base.html
+++ b/site/plugins/admin/views/partials/base.html
@@ -178,7 +178,12 @@
             </nav>
             {% endif %}
 
-            {% if is_current_path('admin.entries.index') or is_current_path('admin.entries.edit') %}
+            {% if is_current_path('admin.entries.index') or
+                  is_current_path('admin.entries.edit') or
+                  is_current_path('admin.entries.add') or
+                  is_current_path('admin.entries.move') or
+                  is_current_path('admin.entries.rename') or
+                  is_current_path('admin.entries.type') %}
             <div class="entry-editor-heading">
                 {% for part in parts %}
                     {% set i = i - 1 %}
diff --git a/site/plugins/admin/views/templates/content/entries/index.html b/site/plugins/admin/views/templates/content/entries/index.html
index aee8c77e..beb023fa 100644
--- a/site/plugins/admin/views/templates/content/entries/index.html
+++ b/site/plugins/admin/views/templates/content/entries/index.html
@@ -49,7 +49,7 @@
                     <a class="dropdown-item" href="{{ path_for('admin.entries.rename') }}?id={{ entry.slug }}">{{ tr('admin_rename') }}</a>
                     <a class="dropdown-item" href="{{ path_for('admin.entries.move') }}?id={{ entry.slug }}">{{ tr('admin_move') }}</a>
                     <a class="dropdown-item" href="{{ base_url() }}/{{ entry.slug }}" target="_blank">{{ tr('admin_preview') }}</a>
-                    <a class="dropdown-item" href="{{ path_for('admin.entries.type') }}?entry={{ entry.slug }}">{{ tr('admin_type') }}</a>
+                    <a class="dropdown-item" href="{{ path_for('admin.entries.type') }}?id={{ entry.slug }}">{{ tr('admin_type') }}</a>
                   </div>
                 </div>
                 <form id="duplicate-id-{{ entry.slug }}" action="{{ path_for('admin.entries.duplicateProcess') }}" method="POST" style="display: none;">
diff --git a/site/plugins/admin/views/templates/content/entries/type.html b/site/plugins/admin/views/templates/content/entries/type.html
index f5c40d94..9fb5c8ce 100644
--- a/site/plugins/admin/views/templates/content/entries/type.html
+++ b/site/plugins/admin/views/templates/content/entries/type.html
@@ -10,7 +10,7 @@
                 <label for="title">{{ tr('admin_type') }}</label>
                 <select class="form-control" name="fieldset">
                 {% for key, value in fieldsets %}
-                    <option value="{{ key }}" {% if key == fieldset %}selected{% endif %}>{{ value }}</option>
+                    <option value="{{ key }}-{{fieldset}}" {% if key == fieldset %}selected{% endif %}>{{ value }}</option>
                 {% endfor %}
                 </select>
             </div>