diff --git a/js/content.js b/js/content.js
index d917a631..0cb89699 100644
--- a/js/content.js
+++ b/js/content.js
@@ -80,7 +80,7 @@ $(function () {
 		if (e.keyCode == 27) {
 			$("#myModal").fadeOut(fadetime);
 			$("#snackbar").attr("class", "");
-		} else if (e.keyCode == 13) {
+		} else if (e.keyCode == 13 && $('#myModal').is(':visible')) {
 			/*save course when hit enter*/
 			saveCourse();
 		}
diff --git a/manifest.json b/manifest.json
index fee0fbd2..2b5454c8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
 
   "name": "UT Registration Plus",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "options_page": "options.html",
   "description": "Improves the course registration process at the University of Texas at Austin!",
   "permissions": ["tabs",