diff --git a/app/src/main/kotlin/net/h34t/filemure/Util.kt b/app/src/main/kotlin/net/h34t/filemure/Util.kt
index e656df0..be57ab3 100644
--- a/app/src/main/kotlin/net/h34t/filemure/Util.kt
+++ b/app/src/main/kotlin/net/h34t/filemure/Util.kt
@@ -48,11 +48,12 @@ fun formatHumanReadableSize(bytes: Long) = when (bytes) {
     else -> "${bytes / 1_000_000_000} gb"
 }
 
-private val tagSplitRegex = Regex("\\s")
+private val tagSplitRegex = Regex("\\s+")
 
 object TagAdapter {
     fun parse(ser: String?): List<Tag> {
-        return ser?.let { if (it.isNotBlank()) it.split(tagSplitRegex).map { Tag(it) } else emptyList() } ?: emptyList()
+        return ser?.trim()?.let { if (it.isNotBlank()) it.split(tagSplitRegex).map { Tag(it) } else emptyList() }
+            ?: emptyList()
     }
 
     fun List<Tag>.serialize() = if (this.isEmpty()) "" else this.joinToString(",") { it.value }
diff --git a/app/src/main/tpl/net.h34t.filemure.tpl/DocumentCreateForm.tpl.html b/app/src/main/tpl/net.h34t.filemure.tpl/DocumentCreateForm.tpl.html
index 817c716..59ccdfa 100644
--- a/app/src/main/tpl/net.h34t.filemure.tpl/DocumentCreateForm.tpl.html
+++ b/app/src/main/tpl/net.h34t.filemure.tpl/DocumentCreateForm.tpl.html
@@ -15,9 +15,8 @@
         </div>
 
         <div class="field border label">
-            <input id="itags" type="text" name="tags">
+            <input id="itags" type="text" name="tags" value="{for $tags}{*$tag} {/for}">
             <label for="itags">Tags</label>
-            <div id="tags">{for $tags}<span>{*$tag}</span>{/for}</div>
         </div>
 
         <div class="field textarea label border">
diff --git a/app/src/main/tpl/net.h34t.filemure.tpl/DocumentEditForm.tpl.html b/app/src/main/tpl/net.h34t.filemure.tpl/DocumentEditForm.tpl.html
index 6767c31..a78de53 100644
--- a/app/src/main/tpl/net.h34t.filemure.tpl/DocumentEditForm.tpl.html
+++ b/app/src/main/tpl/net.h34t.filemure.tpl/DocumentEditForm.tpl.html
@@ -14,9 +14,8 @@
         </div>
 
         <div class="field border label">
-            <input id="itags" type="text" name="tags">
+            <input id="itags" type="text" name="tags" value="{for $tags}{*$tag} {/for}">
             <label for="itags">Tags</label>
-            <div id="tags">{for $tags}<span>{*$tag}</span>{/for}</div>
         </div>
 
         <div class="field textarea label border">