diff --git a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
index c04b01e40a..e532ba72ca 100644
--- a/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
+++ b/Source/Core/DolphinQt/FIFO/FIFOAnalyzer.cpp
@@ -339,6 +339,9 @@ void FIFOAnalyzer::UpdateDetails()
   }
 
   m_detail_list->addItem(new_label);
+
+  // Needed to ensure the description updates when changing objects
+  m_detail_list->setCurrentRow(0);
 }
 
 void FIFOAnalyzer::BeginSearch()
@@ -487,6 +490,9 @@ void FIFOAnalyzer::UpdateDescription()
   if (items.isEmpty() || m_object_data_offsets.empty())
     return;
 
+  if (items[0]->data(0, FRAME_ROLE).isNull() || items[0]->data(0, OBJECT_ROLE).isNull())
+    return;
+
   const u32 frame_nr = items[0]->data(0, FRAME_ROLE).toUInt();
   const u32 object_nr = items[0]->data(0, OBJECT_ROLE).toUInt();
   const u32 entry_nr = m_detail_list->currentRow();