diff --git a/Mainwindow.cpp b/Mainwindow.cpp
index bba25be..f26bbb7 100644
--- a/Mainwindow.cpp
+++ b/Mainwindow.cpp
@@ -80,6 +80,10 @@ void MainWindow::on_pushButton_Run_clicked()
     settings.fileNameNegative = ui->lineEdit_fileNegative->text();
     settings.fileNamePositive = ui->lineEdit_filePositive->text();
     settings.licksToReward = ui->lineEdit_licksToReward->text().toInt();
+
+    if(ui->checkBox_autoFilename->isChecked()){
+        generateAutoFileName();
+    }
     settings.logFileName = ui->lineEdit_outputFolder->text() + "/" + ui->lineEdit_outputFilename->text() + ".csv";
 
 
@@ -144,22 +148,7 @@ void MainWindow::on_checkBox_autoFilename_clicked(bool checked)
 {
     // auto option checked
     if(checked) {
-        time_t rawtime;
-        struct tm * timeinfo;
-        // ensure buffer is big enought
-        char buffer[42];
-
-        // current date/time based on current system
-        time(&rawtime);
-        // convert now to string form
-        timeinfo = localtime(&rawtime);
-
-        // write date/time info into formatted string
-        strftime(buffer,42,"%Y%m%d%H%M%S_AudioGame_events",timeinfo);
-        QString autoFilename(buffer);
-
-        // write to input field and disable it
-        ui->lineEdit_outputFilename->setText(autoFilename);
+        ui->lineEdit_outputFilename->setText("YYYYMMDDhhmmss_AudioGame_events");
         ui->lineEdit_outputFilename->setDisabled(true);
     } else {
         // clear input field and enable it
@@ -222,6 +211,9 @@ void MainWindow::onStateMachineTerminated()
 {
     ui->pushButton_Run->setText("Run");
     ui->pushButton_Run->setDisabled(false);
+    if(ui->checkBox_autoFilename->isChecked()){
+        ui->lineEdit_outputFilename->setText("YYYYMMDDhhmmss_AudioGame_events");
+    }
 }
 
 void MainWindow::onStatusMessage(QString statusMessage)
@@ -249,6 +241,25 @@ void MainWindow::updateIti()
     }
 }
 
+void MainWindow::generateAutoFileName()
+{
+    time_t rawtime;
+    struct tm * timeinfo;
+    // ensure buffer is big enought
+    char buffer[42];
+
+    // current date/time based on current system
+    time(&rawtime);
+    // convert now to string form
+    timeinfo = localtime(&rawtime);
+
+    // write date/time info into formatted string
+    strftime(buffer,42,"%Y%m%d%H%M%S_AudioGame_events",timeinfo);
+
+    // write to input field and disable it
+    ui->lineEdit_outputFilename->setText(QString(buffer));
+}
+
 void MainWindow::on_pushButton_about_clicked()
 {
     AboutDialog* aboutDialog = new AboutDialog(this);
diff --git a/Mainwindow.h b/Mainwindow.h
index 39168c4..1cb197f 100644
--- a/Mainwindow.h
+++ b/Mainwindow.h
@@ -51,6 +51,7 @@ private slots:
     StateMachineController smc;
 
     void updateIti();
+    void generateAutoFileName();
     const double userReaction = 30; //sec
 
     const QString DEFAULT_DIR_KEY = "/home";