diff --git a/src/MainWindow.cpp b/src/MainWindow.cpp
index 9bbda08..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();
@@ -408,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>