diff --git a/apps/opencs/view/widget/pushbutton.cpp b/apps/opencs/view/widget/pushbutton.cpp
index 61afa0d9d..8b70cb6b8 100644
--- a/apps/opencs/view/widget/pushbutton.cpp
+++ b/apps/opencs/view/widget/pushbutton.cpp
@@ -12,6 +12,17 @@ void CSVWidget::PushButton::keyPressEvent (QKeyEvent *event)
     QPushButton::keyPressEvent (event);
 }
 
+void CSVWidget::PushButton::keyReleaseEvent (QKeyEvent *event)
+{
+    if (event->key()==Qt::Key_Return || event->key()==Qt::Key_Enter)
+    {
+        mKeepOpen = event->modifiers() & Qt::ShiftModifier;
+        emit clicked();
+    }
+
+    QPushButton::keyReleaseEvent (event);
+}
+
 void CSVWidget::PushButton::mouseReleaseEvent (QMouseEvent *event)
 {
     mKeepOpen = event->button()==Qt::LeftButton && (event->modifiers() & Qt::ShiftModifier);
diff --git a/apps/opencs/view/widget/pushbutton.hpp b/apps/opencs/view/widget/pushbutton.hpp
index aa9da4885..961b3ed11 100644
--- a/apps/opencs/view/widget/pushbutton.hpp
+++ b/apps/opencs/view/widget/pushbutton.hpp
@@ -15,6 +15,8 @@ namespace CSVWidget
 
             virtual void keyPressEvent (QKeyEvent *event);
 
+            virtual void keyReleaseEvent (QKeyEvent *event);
+
             virtual void mouseReleaseEvent (QMouseEvent *event);
 
         public: