diff --git a/scripts/FeedController.js b/scripts/FeedController.js
index af66d05..09d9a82 100644
--- a/scripts/FeedController.js
+++ b/scripts/FeedController.js
@@ -150,8 +150,10 @@ angular.module('flashy.FeedController', ['ui.router', 'ngAnimate', 'ngWebSocket'
         $('#new-card-input').on('keydown', function(e) {
             if (e.which == 13) {
                 e.preventDefault();
-                $scope.pushCard();
-                listenForC = true;
+                if ($scope.submit_enabled) {
+                    $scope.pushCard();
+                    listenForC = true;
+                }
                 return false;
             } else {