diff --git a/core/templates/core/new_item.html b/core/templates/core/new_item.html
index 2c3c473..3b7bdd3 100644
--- a/core/templates/core/new_item.html
+++ b/core/templates/core/new_item.html
@@ -10,10 +10,9 @@
       <div class="d-flex gap-2"><button class="btn btn-success px-3 py-2" title="{% trans 'Save' %}">✓</button><a class="btn btn-danger px-3 py-2" href="{{ next_url }}" title="{% trans 'Cancel' %}">×</a></div>
     </div>
     <div class="mobile-tag-picker">
-      <button type="button" class="btn btn-sm btn-outline-secondary" @click="showTags=true">{% trans "Add tags" %}</button>
-      <div class="mobile-tag-backdrop" x-show="showTags" @click="showTags=false" x-cloak></div>
-      <div class="mobile-tag-popup card shadow" x-show="showTags" x-cloak>
-        <div class="card-body"><div class="d-flex justify-content-between align-items-center mb-2"><strong>{% trans "Choose tag" %}</strong><button type="button" class="btn-close" @click="showTags=false"></button></div><div class="d-flex flex-wrap gap-2">{% for tag in tags %}<button type="button" class="btn btn-sm btn-outline-secondary" @click="addToken('#{{ tag.name|escapejs }}')">#{{ tag.name }}</button>{% endfor %}</div></div>
+      <div class="small text-muted mb-1">{% trans "Add tags" %}</div>
+      <div class="d-flex flex-wrap gap-2 p-2 bg-light rounded">
+        {% for tag in tags %}<button type="button" class="btn btn-sm btn-outline-secondary" @click="addToken('#{{ tag.name|escapejs }}')">#{{ tag.name }}</button>{% endfor %}
       </div>
     </div>
     <textarea class="form-control" name="content" rows="14" placeholder="Text … #tag [[  ![[" x-model="text" @keydown="onKeydown($event)" @input="onInput($event)" @paste="handlePaste($event)"></textarea>
diff --git a/core/views.py b/core/views.py
index 9019b6c..a752dad 100644
--- a/core/views.py
+++ b/core/views.py
@@ -235,7 +235,9 @@ def index(request):
 @login_required
 def new_item(request):
     requested_kind = request.GET.get('kind', '')
-    next_url = request.GET.get('next') or request.POST.get('next') or 'index'
+    next_url = request.GET.get('next') or request.POST.get('next') or reverse('index')
+    if next_url == 'index':
+        next_url = reverse('index')
     if request.method == 'POST':
         form = QuickItemForm(request.POST, request.FILES)
         if form.is_valid():