diff --git a/client/src/components/NoteTagEdit.vue b/client/src/components/NoteTagEdit.vue
index bf2f85e..07b0ea5 100644
--- a/client/src/components/NoteTagEdit.vue
+++ b/client/src/components/NoteTagEdit.vue
@@ -144,7 +144,7 @@
 				//Enter - 13 - Execute addTag() function
 				if(code == 13){
 					//If an item from list is selected, make that the text
-					if(this.selection > -1){
+					if(this.selection > -1 && this.suggestions[vm.selection]){
 						this.newTagInput = this.suggestions[vm.selection].text
 					}
 					this.addTag()