diff --git a/src/Gui/DemoMode.cpp b/src/Gui/DemoMode.cpp
index d6f9f40e0c..b150311c63 100644
--- a/src/Gui/DemoMode.cpp
+++ b/src/Gui/DemoMode.cpp
@@ -35,6 +35,7 @@
 #include "ui_DemoMode.h"
 
 #include "Application.h"
+#include "Command.h"
 #include "Document.h"
 #include "MainWindow.h"
 #include "View3DInventor.h"
@@ -46,10 +47,12 @@ using namespace Gui::Dialog;
 /* TRANSLATOR Gui::Dialog::DemoMode */
 
 DemoMode::DemoMode(QWidget* /*parent*/, Qt::WindowFlags fl)
-  : QDialog(0, fl|Qt::WindowStaysOnTopHint), viewAxis(0,0,-1), ui(new Ui_DemoMode)
+  : QDialog(nullptr, fl|Qt::WindowStaysOnTopHint), viewAxis(0,0,-1), ui(new Ui_DemoMode)
 {
     // create widgets
     ui->setupUi(this);
+    ui->playButton->setCheckable(true);
+
     timer = new QTimer(this);
     timer->setInterval(1000 * ui->timeout->value());
     connect(timer, SIGNAL(timeout()), this, SLOT(onAutoPlay()));
@@ -70,7 +73,9 @@ DemoMode::~DemoMode()
 void DemoMode::reset()
 {
     on_fullscreen_toggled(false);
-    on_stopButton_clicked();
+    Gui::View3DInventor* view = activeView();
+    if (view)
+        view->getViewer()->stopAnimating();
     ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
         ("User parameter:BaseApp/Preferences/View");
     hGrp->Notify("UseAutoRotation");
@@ -127,12 +132,12 @@ Gui::View3DInventor* DemoMode::activeView() const
         }
     }
 
-    return 0;
+    return nullptr;
 }
 
 float DemoMode::getSpeed(int v) const
 {
-    float speed = ((float)v)/50.0f; // let 2.0 be the maximum speed
+    float speed = (static_cast<float>(v))/50.0f; // let 2.0 be the maximum speed
     return speed;
 }
 
@@ -191,36 +196,39 @@ void DemoMode::on_speedSlider_valueChanged(int v)
     }
 }
 
-void DemoMode::on_playButton_clicked()
+void DemoMode::on_playButton_toggled(bool pressed)
 {
     Gui::View3DInventor* view = activeView();
     if (view) {
-        if (!view->getViewer()->isAnimating()) {
-            SoCamera* cam = view->getViewer()->getSoRenderManager()->getCamera();
-            if (cam) {
-                SbRotation rot = cam->orientation.getValue();
-                SbVec3f vec(0,-1,0);
-                rot.multVec(vec, this->viewAxis);
+        if (pressed) {
+            if (!view->getViewer()->isAnimating()) {
+                SoCamera* cam = view->getViewer()->getSoRenderManager()->getCamera();
+                if (cam) {
+                    SbRotation rot = cam->orientation.getValue();
+                    SbVec3f vec(0,-1,0);
+                    rot.multVec(vec, this->viewAxis);
+                }
             }
+
+            startAnimation(view);
+            ui->playButton->setText(tr("Stop"));
+        }
+        else {
+            view->getViewer()->stopAnimating();
+            ui->playButton->setText(tr("Play"));
         }
-
-        startAnimation(view);
     }
 }
 
-void DemoMode::on_stopButton_clicked()
-{
-    Gui::View3DInventor* view = activeView();
-    if (view)
-        view->getViewer()->stopAnimating();
-}
-
 void DemoMode::on_fullscreen_toggled(bool on)
 {
     Gui::View3DInventor* view = activeView();
     if (view) {
-        view->setCurrentViewMode(on ? MDIView::/*TopLevel*/FullScreen : MDIView::Child);
+        CommandManager &rcCmdMgr = Application::Instance->commandManager();
+        Command* cmd = rcCmdMgr.getCommandByName("Std_ViewDockUndockFullscreen");
+        if (cmd) cmd->invoke(on ? MDIView::FullScreen : MDIView::Child);
         this->activateWindow();
+        ui->playButton->setChecked(false);
     }
     if (on) {
         qApp->installEventFilter(this);
@@ -241,7 +249,7 @@ void DemoMode::onAutoPlay()
 {
     Gui::View3DInventor* view = activeView();
     if (view && !view->getViewer()->isAnimating()) {
-        startAnimation(view);
+        ui->playButton->setChecked(true);
     }
 }
 
diff --git a/src/Gui/DemoMode.h b/src/Gui/DemoMode.h
index e08c91926e..1bcf09240c 100644
--- a/src/Gui/DemoMode.h
+++ b/src/Gui/DemoMode.h
@@ -51,8 +51,7 @@ public:
     void reject();
 
 protected Q_SLOTS:
-    void on_playButton_clicked();
-    void on_stopButton_clicked();
+    void on_playButton_toggled(bool);
     void on_fullscreen_toggled(bool);
     void on_timerCheck_toggled(bool);
     void on_speedSlider_valueChanged(int);
diff --git a/src/Gui/DemoMode.ui b/src/Gui/DemoMode.ui
index bb4c04d3ab..125f8eae59 100644
--- a/src/Gui/DemoMode.ui
+++ b/src/Gui/DemoMode.ui
@@ -190,13 +190,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="stopButton">
-       <property name="text">
-        <string>Stop</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <spacer>
        <property name="orientation">
@@ -227,7 +220,6 @@
   <tabstop>fullscreen</tabstop>
   <tabstop>timerCheck</tabstop>
   <tabstop>playButton</tabstop>
-  <tabstop>stopButton</tabstop>
   <tabstop>okButton</tabstop>
  </tabstops>
  <resources>