diff --git a/src/InputObject.cpp b/src/InputObject.cpp
index ee7480e..dbd022a 100644
--- a/src/InputObject.cpp
+++ b/src/InputObject.cpp
@@ -7,7 +7,7 @@
 #include <QComboBox>
 #include <QDateEdit>
 #include <QtVirtualKeyboard>
-
+#include <QKeyEvent>
 #include <QLineEdit>
 #include <QAbstractSpinBox>
 
@@ -91,6 +91,14 @@ bool InputObject::eventFilter(QObject* obj, QEvent* event)
 
 		//qDebug() << "touchScreen()";
 	}
+	if (event->type() == QEvent::KeyPress) {
+		QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
+		if (keyEvent->key() == Qt::Key_Return && curDateEdit)
+		{
+			this->HidePanel();
+			this->hide();
+		}
+	}
 	//mouse button release means setfocus is useless
 	if (event->type() == QEvent::MouseButtonRelease)
 	{