diff --git a/src/jquery.tagsinput.js b/src/jquery.tagsinput.js
index b6c75e4..c5124ef 100644
--- a/src/jquery.tagsinput.js
+++ b/src/jquery.tagsinput.js
@@ -189,7 +189,8 @@
       placeholderColor:'#666666',
       autosize: true,
       comfortZone: 20,
-      inputPadding: 6*2
+      inputPadding: 6*2,
+      submitOnEnter: false
     },options);
 
     	var uniqueIdCounter = 0;
@@ -303,6 +304,9 @@
 				$(data.fake_input).bind('keypress',data,function(event) {
 					if (_checkDelimiter(event)) {
 					    event.preventDefault();
+						if (event.which == 13 && $(event.data.fake_input).val() == '' && settings.submitOnEnter == true ) {
+							return true;
+						}
 						if( (event.data.minChars <= $(event.data.fake_input).val().length) && (!event.data.maxChars || (event.data.maxChars >= $(event.data.fake_input).val().length)) )
 							$(event.data.real_input).addTag($(event.data.fake_input).val(),{focus:true,unique:(settings.unique)});
 					  	$(event.data.fake_input).resetAutosize(settings);