diff --git a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
index 4b9020ab8f..db0ff42488 100644
--- a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
@@ -165,6 +165,9 @@ void FIFOAnalyzer::UpdateDetails()
   m_detail_list->clear();
   m_object_data_offsets.clear();
 
+  if (!FifoPlayer::GetInstance().IsPlaying())
+    return;
+
   auto items = m_tree_widget->selectedItems();
 
   if (items.isEmpty() || items[0]->data(0, OBJECT_ROLE).isNull())
@@ -316,6 +319,9 @@ void FIFOAnalyzer::BeginSearch()
 {
   QString search_str = m_search_edit->text();
 
+  if (!FifoPlayer::GetInstance().IsPlaying())
+    return;
+
   auto items = m_tree_widget->selectedItems();
 
   if (items.isEmpty() || items[0]->data(0, FRAME_ROLE).isNull())
@@ -462,6 +468,9 @@ void FIFOAnalyzer::UpdateDescription()
 {
   m_entry_detail_browser->clear();
 
+  if (!FifoPlayer::GetInstance().IsPlaying())
+    return;
+
   auto items = m_tree_widget->selectedItems();
 
   if (items.isEmpty())
diff --git a/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
index 0b76a9e72c..c4d29b1165 100644
--- a/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOPlayerWindow.cpp
@@ -245,6 +245,7 @@ void FIFOPlayerWindow::OnEmulationStopped()
     StopRecording();
 
   UpdateControls();
+  m_analyzer->Update();
 }
 
 void FIFOPlayerWindow::OnRecordingDone()