diff --git a/app/viewmainpage.cpp b/app/viewmainpage.cpp
--- a/app/viewmainpage.cpp
+++ b/app/viewmainpage.cpp
@@ -784,13 +784,13 @@
 bool ViewMainPage::eventFilter(QObject* watched, QEvent* event)
 {
     if (event->type() == QEvent::ShortcutOverride) {
-        const QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
-        if (keyEvent->key() == Qt::Key_Escape) {
+        const auto key = static_cast<QKeyEvent*>(event)->key();
+        if (key == Qt::Key_Space || key == Qt::Key_Escape) {
             const DocumentView* view = d->currentView();
             if (view) {
                 AbstractRasterImageViewTool* tool = view->currentTool();
                 if (tool) {
-                    QKeyEvent toolKeyEvent(QEvent::KeyPress, Qt::Key_Escape, Qt::NoModifier);
+                    QKeyEvent toolKeyEvent(QEvent::KeyPress, key, Qt::NoModifier);
                     tool->keyPressEvent(&toolKeyEvent);
                     if (toolKeyEvent.isAccepted()) {
                         event->accept();
diff --git a/lib/crop/croptool.cpp b/lib/crop/croptool.cpp
--- a/lib/crop/croptool.cpp
+++ b/lib/crop/croptool.cpp
@@ -26,6 +26,7 @@
 #include <QDialogButtonBox>
 #include <QGraphicsSceneMouseEvent>
 #include <QPainter>
+#include <QPushButton>
 #include <QRect>
 #include <QDebug>
 
@@ -426,7 +427,11 @@
     case Qt::Key_Return:
     case Qt::Key_Enter:
         event->accept();
-        buttons->accepted();
+        if (buttons->button(QDialogButtonBox::Cancel)->hasFocus()) {
+            buttons->rejected();
+        } else {
+            buttons->accepted();
+        }
         break;
     default:
         break;
diff --git a/lib/redeyereduction/redeyereductiontool.cpp b/lib/redeyereduction/redeyereductiontool.cpp
--- a/lib/redeyereduction/redeyereductiontool.cpp
+++ b/lib/redeyereduction/redeyereductiontool.cpp
@@ -175,7 +175,11 @@
     case Qt::Key_Return:
     case Qt::Key_Enter:
         event->accept();
-        buttons->accepted();
+        if (buttons->button(QDialogButtonBox::Cancel)->hasFocus()) {
+            buttons->rejected();
+        } else {
+            buttons->accepted();
+        }
         break;
     default:
         break;