Merge 6b9b371 into 4527b66

mesosphere · Jan 22, 2016 · 82e7cf3 · 82e7cf3
2 parents 4527b66 + 6b9b371
commit 82e7cf3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Unversioned
+### Fixed
+- \#3605 - Prevent ctrl-c keyboard shortcut from showing the Create modal dialog
+
 ## 0.15.0 - 2016-01-20
 ### Added
 - \#2814 - Add contextual dropdown menu to Application List items

diff --git a/src/js/components/Marathon.jsx b/src/js/components/Marathon.jsx
@@ -120,7 +120,7 @@ var Marathon = React.createClass({
 
     Mousetrap.bind("c", function () {
       router.transitionTo(router.getCurrentPathname(), {}, {modal: "new-app"});
-    }, "keyup");
+    }, "keypress");
 
     Mousetrap.bind("g a", function () {
       if (this.state.modal == null) {