diff --git a/src/Mara/Gui/MainWindow.cpp b/src/Mara/Gui/MainWindow.cpp
index 8a259fe341bbe60d622391f9719335450c8df7af..62d6a60649ad2066f66cf1130e6e34a28a94fe15 100644
--- a/src/Mara/Gui/MainWindow.cpp
+++ b/src/Mara/Gui/MainWindow.cpp
@@ -454,6 +454,7 @@ void MainWindow::on_actionPlay_triggered( bool checked ) {
 }
 
 void MainWindow::on_actionStop_triggered() {
+    on_actionPlay_triggered( false );
     Ra::Engine::RadiumEngine::getInstance()->resetTime();
     actionPlay->setChecked( false );
     emit frameUpdate();
@@ -503,8 +504,7 @@ void MainWindow::timelinePlay( bool play ) {
     actionPlay->setChecked( play );
     if ( !m_lockTimeSystem )
     {
-        Ra::Engine::RadiumEngine::getInstance()->play( play );
-        //       mainApp->setContinuousUpdate( play );
+        on_actionPlay_triggered( play );
     }
 }