diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index d09e473..cff9f9f 100644
--- a/src/MainWindow.cpp
+++ b/src/MainWindow.cpp
@@ -242,7 +242,7 @@ void MainWindow::on_playButton_clicked()
 
 void MainWindow::on_pauseButton_clicked()
 {
-	if (isPlaying && !isPaused)
+	if (isPlaying && !isPaused && audioPlayer->isPlaying())
 	{
 		// Pause playback
 		audioPlayer->pause();
@@ -311,6 +311,7 @@ void MainWindow::on_songListView_doubleClicked(const QModelIndex &index)
 
 	if (index.column() == 0)
 	{
+		isPaused = false;
 		if (isPlaying)
 		{
 			audioPlayer->stop();
@@ -318,8 +319,8 @@ void MainWindow::on_songListView_doubleClicked(const QModelIndex &index)
 		else
 		{
 			isPlaying = true;
-			updateControls();
 		}
+		updateControls();
 
 		flushGenerationQueue();
 		ui->nowPlayingLabel->setText("Now Playing: Waiting for generation...");
@@ -407,6 +408,7 @@ void MainWindow::playSong(const SongItem& song)
 	ui->nowPlayingLabel->setText("Now Playing: " + song.caption);
 	ui->lyricsTextEdit->setPlainText(song.lyrics);
 	ui->jsonTextEdit->setPlainText(song.json);
+	updateControls();
 }
 
 void MainWindow::songGenerated(const SongItem& song)
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index 828189b..8d0a9ef 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -178,6 +178,9 @@
        </item>
        <item>
         <widget class="QPushButton" name="pauseButton">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
          <property name="text">
           <string>Pause</string>
          </property>
diff --git a/src/SongItem.cpp b/src/SongItem.cpp
index 68eef23..4b1686e 100644
--- a/src/SongItem.cpp
+++ b/src/SongItem.cpp
@@ -1,7 +1,7 @@
 #include "SongItem.h"
 
 SongItem::SongItem(const QString &caption, const QString &lyrics)
-	: caption(caption), lyrics(lyrics), cotCaption(true)
+	: caption(caption), lyrics(lyrics), cotCaption(true), bpm(0)
 {
 	uniqueId = QRandomGenerator::global()->generate64();
 }