diff --git a/src/js/components/fields/tags.riot b/src/js/components/fields/tags.riot
index 1312e29..40c23b1 100644
--- a/src/js/components/fields/tags.riot
+++ b/src/js/components/fields/tags.riot
@@ -2,7 +2,7 @@
     <div class="field-tags">
 
         <select name="{ state.options.name }[]" multiple style="display: none;">
-            <option each={ tag in state.tags } value={ tag }></option>
+            <option each={ tag in state.tags } value={ tag } selected></option>
         </select>
 
         <label class="field-label">
@@ -30,7 +30,7 @@
                 </li>
             </ul>
         </div>
-        
+
     </div>
     <script>
 
@@ -155,8 +155,6 @@
                     this.state.tags.push(value)
                     this.update()
 
-                    // select new option
-                    this.$('select option[value="' + value + '"]').selected = true
                     this.$('input').value = ''
                 } else if (value.length === 0) {
                     this.state.errors.push('Required!')
diff --git a/src/js/database/apps.js b/src/js/database/apps.js
index 7c0d15d..b18a77b 100644
--- a/src/js/database/apps.js
+++ b/src/js/database/apps.js
@@ -86,9 +86,9 @@ class AppsDatabase extends DatabaseHandler {
             if (entry && entry[key]) {
                 fileHandler.remove(entry[key])
             }
-        }
 
-        file = fileHandler.put(file.name, file.type, file.data)
+            file = fileHandler.put(file.name, file.type, file.data)
+        }
 
         return file
     }