diff --git a/nixtape/js/player.js b/nixtape/js/player.js
index 10bb9cf53dfa500e66f2eb055fd8f998daa8d61b..70ad63a9f31f429f1112389ff49889e5926d8513 100644
--- a/nixtape/js/player.js
+++ b/nixtape/js/player.js
@@ -175,11 +175,9 @@ function playerReady() {
 		$('#close_tag').on('click', toggleTag);
 		$('#close_tag').hide();
 
-		$('#tag_button').on('click', tag);
-		$('#tags').keyup(function(event) {
-			if(event.keyCode == 13) {
-				tag();
-			}
+		$('#tag_input').on('submit', function(event) {
+			event.preventDefault();
+			tag();
 		});
 		$('#tag_input').hide();
 	} else {