diff --git a/Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.cpp b/Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.cpp
diff --git a/Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.h b/Source/Core/DolphinQt2/FIFO/FIFOAnalyzer.h
@@ -0,0 +1,67 @@
+// Copyright 2018 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include <vector>
+
+#include <QWidget>
+
+class QGroupBox;
+class QLabel;
+class QLineEdit;
+class QListWidget;
+class QPushButton;
+class QSplitter;
+class QTextBrowser;
+class QTreeWidget;
+
+class FIFOAnalyzer final : public QWidget
+{
+  Q_OBJECT
+
+public:
+  explicit FIFOAnalyzer();
+  ~FIFOAnalyzer();
+
+  void Update();
+
+private:
+  void CreateWidgets();
+  void ConnectWidgets();
+
+  void BeginSearch();
+  void FindNext();
+  void FindPrevious();
+
+  void ShowSearchResult(size_t index);
+
+  void UpdateTree();
+  void UpdateDetails();
+  void UpdateDescription();
+
+  QTreeWidget* m_tree_widget;
+  QListWidget* m_detail_list;
+  QTextBrowser* m_entry_detail_browser;
+  QSplitter* m_object_splitter;
+
+  // Search
+  QGroupBox* m_search_box;
+  QLineEdit* m_search_edit;
+  QPushButton* m_search_new;
+  QPushButton* m_search_next;
+  QPushButton* m_search_previous;
+  QLabel* m_search_label;
+  QSplitter* m_search_splitter;
+
+  struct SearchResult
+  {
+    int frame;
+    int object;
+    int cmd;
+  };
+
+  std::vector<int> m_object_data_offsets;
+  std::vector<SearchResult> m_search_results;
+};
diff --git a/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp → ...Core/DolphinQt2/FIFO/FIFOPlayerWindow.cpp b/Source/Core/DolphinQt2/FIFOPlayerWindow.cpp → ...Core/DolphinQt2/FIFO/FIFOPlayerWindow.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "DolphinQt2/FIFOPlayerWindow.h"
+#include "DolphinQt2/FIFO/FIFOPlayerWindow.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -13,6 +13,7 @@
 #include <QMessageBox>
 #include <QPushButton>
 #include <QSpinBox>
+#include <QTabWidget>
 #include <QVBoxLayout>
 
 #include <algorithm>
@@ -23,6 +24,7 @@
 #include "Core/FifoPlayer/FifoPlayer.h"
 #include "Core/FifoPlayer/FifoRecorder.h"
 
+#include "DolphinQt2/FIFO/FIFOAnalyzer.h"
 #include "DolphinQt2/QtUtils/QueueOnObject.h"
 #include "DolphinQt2/Settings.h"
 
@@ -142,7 +144,20 @@ void FIFOPlayerWindow::CreateWidgets()
   layout->addWidget(recording_group);
   layout->addWidget(m_button_box);
 
-  setLayout(layout);
+  QWidget* main_widget = new QWidget(this);
+  main_widget->setLayout(layout);
+
+  auto* tab_widget = new QTabWidget(this);
+
+  m_analyzer = new FIFOAnalyzer;
+
+  tab_widget->addTab(main_widget, tr("Play / Record"));
+  tab_widget->addTab(m_analyzer, tr("Analyze"));
+
+  auto* tab_layout = new QVBoxLayout;
+  tab_layout->addWidget(tab_widget);
+
+  setLayout(tab_layout);
 }
 
 void FIFOPlayerWindow::ConnectWidgets()
@@ -292,6 +307,8 @@ void FIFOPlayerWindow::OnFIFOLoaded()
   UpdateInfo();
   UpdateLimits();
   UpdateControls();
+
+  m_analyzer->Update();
 }
 
 void FIFOPlayerWindow::OnEarlyMemoryUpdatesChanged(bool enabled)

diff --git a/Source/Core/DolphinQt2/FIFOPlayerWindow.h → ...e/Core/DolphinQt2/FIFO/FIFOPlayerWindow.h b/Source/Core/DolphinQt2/FIFOPlayerWindow.h → ...e/Core/DolphinQt2/FIFO/FIFOPlayerWindow.h
@@ -11,6 +11,7 @@ class QDialogButtonBox;
 class QLabel;
 class QPushButton;
 class QSpinBox;
+class FIFOAnalyzer;
 
 class FIFOPlayerWindow : public QDialog
 {
@@ -59,4 +60,6 @@ class FIFOPlayerWindow : public QDialog
   QLabel* m_object_range_to_label;
   QCheckBox* m_early_memory_updates;
   QDialogButtonBox* m_button_box;
+
+  FIFOAnalyzer* m_analyzer;
 };
diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp
@@ -60,7 +60,7 @@
 #include "DolphinQt2/Debugger/MemoryWidget.h"
 #include "DolphinQt2/Debugger/RegisterWidget.h"
 #include "DolphinQt2/Debugger/WatchWidget.h"
-#include "DolphinQt2/FIFOPlayerWindow.h"
+#include "DolphinQt2/FIFO/FIFOPlayerWindow.h"
 #include "DolphinQt2/GCMemcardManager.h"
 #include "DolphinQt2/Host.h"
 #include "DolphinQt2/HotkeyScheduler.h"