diff --git a/source/mainwindow.cpp b/source/mainwindow.cpp
index d5ccfb8..055f656 100644
--- a/source/mainwindow.cpp
+++ b/source/mainwindow.cpp
@@ -26,10 +26,12 @@ MainWindow::MainWindow(QWidget *parent)
 	m_widgetMapper->setModel(&m_dataModel->m_metaData);
 	m_widgetMapper->addMapping(ui->lineEdit, 0);
 	m_widgetMapper->addMapping(ui->lineEdit_2, 1);
-	m_widgetMapper->addMapping(ui->calendarWidget, 2);
-	m_widgetMapper->addMapping(ui->calendarWidget_2, 3);
+	m_widgetMapper->addMapping(ui->dateEdit, 2);
+	m_widgetMapper->addMapping(ui->dateEdit_2, 3);
 	m_widgetMapper->addMapping(ui->textEdit, 4);
 	m_widgetMapper->toFirst();
+
+	connect(ui->calendarWidget, SIGNAL(selectionChanged()), m_widgetMapper, SLOT(submit()));
 }
 
 MainWindow::~MainWindow()
diff --git a/source/mainwindow.ui b/source/mainwindow.ui
index 6c8a1a0..4165469 100644
--- a/source/mainwindow.ui
+++ b/source/mainwindow.ui
@@ -91,6 +91,12 @@
          </property>
         </widget>
        </item>
+       <item row="3" column="1">
+        <widget class="QDateEdit" name="dateEdit"/>
+       </item>
+       <item row="3" column="3">
+        <widget class="QDateEdit" name="dateEdit_2"/>
+       </item>
       </layout>
      </widget>
     </item>