diff --git a/forms/interface.ui b/forms/interface.ui
index 5d401d8a4c76f0d35df82212e3480d8bc6b0d6ce..982aa2aa0ba4e91ab03b058ee9bd7787cffba9ce 100644
--- a/forms/interface.ui
+++ b/forms/interface.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Cellulut</string>
   </property>
   <widget class="QWidget" name="centralwidget">
    <property name="sizePolicy">
diff --git a/src/interface.cpp b/src/interface.cpp
index 547371d10e4d8d41768d490bd5ff29b2a1434cc0..1c2c91cba25a2d0e22063c2f8d99c6905a0b3c2b 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -720,9 +720,8 @@ void MainWindow::play_bad_apple()
     static bool bad_apple_connected;
 #ifdef BAD_APPLE_AUDIO
     static QMediaPlayer bad_apple_player;
-#else
-    static QElapsedTimer bad_apple_elapsed;
 #endif
+    static QElapsedTimer bad_apple_elapsed;
 
     QFile f("extras/bad_apple.json");
     if (!f.open(QFile::ReadOnly | QFile::Text))
@@ -744,7 +743,11 @@ void MainWindow::play_bad_apple()
         bad_apple_timer.callOnTimeout([this]
                                       {
 #ifdef BAD_APPLE_AUDIO
-                                          unsigned frame_idx = bad_apple_player.position()/(1000.f/30);
+                                          unsigned frame_idx;
+                                          if (bad_apple_player.state() == QMediaPlayer::PlayingState)
+                                              frame_idx = bad_apple_player.position()/(1000.f/30);
+                                          else
+                                              frame_idx = bad_apple_elapsed.elapsed()/(1000.f/30);
 #else
                                           unsigned frame_idx = bad_apple_elapsed.elapsed()/(1000.f/30);
 #endif
@@ -786,9 +789,9 @@ void MainWindow::play_bad_apple()
     bad_apple_player.play();
 #else
     QMessageBox::information(this, "", "Music functionnality is only available with Qt 5");
-    bad_apple_elapsed.start();
 #endif
 
+    bad_apple_elapsed.start();
     bad_apple_timer.start(11);
     statusBar()->showMessage("Original : \"Bad Apple!!\" feat. Nomico by Alstroemeria Records", 60000);
 }