diff --git a/src/capture/captureareaselector.cpp b/src/capture/captureareaselector.cpp
index cfd5920..7af9602 100644
--- a/src/capture/captureareaselector.cpp
+++ b/src/capture/captureareaselector.cpp
@@ -236,11 +236,16 @@ void CaptureAreaSelector::hideEvent(QHideEvent * /*event*/)
 void CaptureAreaSelector::keyPressEvent(QKeyEvent *event)
 {
   if (event->key() == Qt::Key_Escape) {
+    if (editor_ && editor_->isVisible())
+      applyEditor();
     cancel();
     return;
   }
 
   if (event->key() == Qt::Key_Return) {
+    if (editor_ && editor_->isVisible())
+      applyEditor();
+
     if (!areas_.empty()) {
       captureAll();
     } else {