diff --git a/Core/Config.cpp b/Core/Config.cpp
index 91264ca5b4..4c5d312bf2 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -1167,6 +1167,9 @@ static ConfigSetting debuggerSettings[] = {
 	ConfigSetting("GEWindowY", &g_Config.iGEWindowY, -1),
 	ConfigSetting("GEWindowW", &g_Config.iGEWindowW, -1),
 	ConfigSetting("GEWindowH", &g_Config.iGEWindowH, -1),
+	ConfigSetting("GEWindowTabsBL", &g_Config.uGETabsLeft, (uint32_t)0),
+	ConfigSetting("GEWindowTabsBR", &g_Config.uGETabsRight, (uint32_t)0),
+	ConfigSetting("GEWindowTabsTR", &g_Config.uGETabsTopRight, (uint32_t)0),
 	ConfigSetting("ConsoleWindowX", &g_Config.iConsoleWindowX, -1),
 	ConfigSetting("ConsoleWindowY", &g_Config.iConsoleWindowY, -1),
 	ConfigSetting("FontWidth", &g_Config.iFontWidth, 8),
diff --git a/Core/Config.h b/Core/Config.h
index e682234ba3..7a35ff0d09 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -462,6 +462,9 @@ public:
 	int iGEWindowY;
 	int iGEWindowW;
 	int iGEWindowH;
+	uint32_t uGETabsLeft;
+	uint32_t uGETabsRight;
+	uint32_t uGETabsTopRight;
 	int iConsoleWindowX;
 	int iConsoleWindowY;
 	int iFontWidth;
diff --git a/GPU/Common/DrawEngineCommon.cpp b/GPU/Common/DrawEngineCommon.cpp
index 0755988029..34e0f7ff90 100644
--- a/GPU/Common/DrawEngineCommon.cpp
+++ b/GPU/Common/DrawEngineCommon.cpp
@@ -266,7 +266,7 @@ bool DrawEngineCommon::GetCurrentSimpleVertices(int count, std::vector<GPUDebugV
 	u16 indexLowerBound = 0;
 	u16 indexUpperBound = count - 1;
 
-	if (!Memory::IsValidAddress(gstate_c.vertexAddr))
+	if (!Memory::IsValidAddress(gstate_c.vertexAddr) || count == 0)
 		return false;
 
 	bool savedVertexFullAlpha = gstate_c.vertexFullAlpha;
diff --git a/GPU/Common/FramebufferManagerCommon.cpp b/GPU/Common/FramebufferManagerCommon.cpp
index bfa097d936..0da6dc00ca 100644
--- a/GPU/Common/FramebufferManagerCommon.cpp
+++ b/GPU/Common/FramebufferManagerCommon.cpp
@@ -472,7 +472,8 @@ VirtualFramebuffer *FramebufferManagerCommon::DoSetRenderFrameBuffer(const Frame
 		vfbs_.push_back(vfb);
 		currentRenderVfb_ = vfb;
 
-		if (useBufferedRendering_ && !g_Config.bDisableSlowFramebufEffects) {
+		// Assume that if we're clearing right when switching to a new framebuffer, we don't need to upload.
+		if (useBufferedRendering_ && !g_Config.bDisableSlowFramebufEffects && params.isDrawing) {
 			gpu->PerformMemoryUpload(params.fb_address, byteSize);
 			// Alpha was already done by PerformMemoryUpload.
 			PerformStencilUpload(params.fb_address, byteSize, StencilUpload::STENCIL_IS_ZERO | StencilUpload::IGNORE_ALPHA);
diff --git a/GPU/Debugger/Playback.cpp b/GPU/Debugger/Playback.cpp
index 8fa93e7d7c..aa34ce3ccf 100644
--- a/GPU/Debugger/Playback.cpp
+++ b/GPU/Debugger/Playback.cpp
@@ -367,6 +367,7 @@ bool DumpExecute::SubmitCmds(const void *p, u32 sz) {
 		Memory::Write_U32((GE_CMD_JUMP << 24) | (execListBuf & 0x00FFFFFF), execListPos + 4);
 
 		execListPos = execListBuf;
+		lastBase_ = execListBuf & 0xFF000000;
 
 		// Don't continue until we've stalled.
 		SyncStall();
@@ -450,9 +451,9 @@ void DumpExecute::Vertices(u32 ptr, u32 sz) {
 		return;
 	}
 
-	if (lastBase_ != (psp & 0x0FF000000)) {
+	if (lastBase_ != (psp & 0xFF000000)) {
 		execListQueue.push_back((GE_CMD_BASE << 24) | ((psp >> 8) & 0x00FF0000));
-		lastBase_ = psp & 0x0FF000000;
+		lastBase_ = psp & 0xFF000000;
 	}
 	execListQueue.push_back((GE_CMD_VADDR << 24) | (psp & 0x00FFFFFF));
 }
@@ -464,9 +465,9 @@ void DumpExecute::Indices(u32 ptr, u32 sz) {
 		return;
 	}
 
-	if (lastBase_ != (psp & 0x0FF000000)) {
+	if (lastBase_ != (psp & 0xFF000000)) {
 		execListQueue.push_back((GE_CMD_BASE << 24) | ((psp >> 8) & 0x00FF0000));
-		lastBase_ = psp & 0x0FF000000;
+		lastBase_ = psp & 0xFF000000;
 	}
 	execListQueue.push_back((GE_CMD_IADDR << 24) | (psp & 0x00FFFFFF));
 }
diff --git a/GPU/Software/TransformUnit.cpp b/GPU/Software/TransformUnit.cpp
index 3c22dc9f5b..b765df8404 100644
--- a/GPU/Software/TransformUnit.cpp
+++ b/GPU/Software/TransformUnit.cpp
@@ -813,6 +813,9 @@ bool TransformUnit::GetCurrentSimpleVertices(int count, std::vector<GPUDebugVert
 	u16 indexLowerBound = 0;
 	u16 indexUpperBound = count - 1;
 
+	if (!Memory::IsValidAddress(gstate_c.vertexAddr) || count == 0)
+		return false;
+
 	if (count > 0 && (gstate.vertType & GE_VTYPE_IDX_MASK) != GE_VTYPE_IDX_NONE) {
 		const u8 *inds = Memory::GetPointer(gstate_c.indexAddr);
 		const u16_le *inds16 = (const u16_le *)inds;
diff --git a/Windows/GEDebugger/CtrlDisplayListView.cpp b/Windows/GEDebugger/CtrlDisplayListView.cpp
index 296851c630..6b521c4996 100644
--- a/Windows/GEDebugger/CtrlDisplayListView.cpp
+++ b/Windows/GEDebugger/CtrlDisplayListView.cpp
@@ -3,6 +3,7 @@
 #include "Common/System/Display.h"
 #include "Windows/GEDebugger/CtrlDisplayListView.h"
 #include "Windows/GEDebugger/GEDebugger.h"
+#include "Windows/MainWindow.h"
 #include "Windows/InputBox.h"
 #include "Windows/W32Util/ContextMenu.h"
 #include "Windows/main.h"
@@ -149,8 +150,7 @@ void CtrlDisplayListView::redraw()
 	GetClientRect(wnd, &rect);
 	visibleRows = rect.bottom/rowHeight;
 
-	InvalidateRect(wnd, NULL, FALSE);
-	UpdateWindow(wnd); 
+	RedrawWindow(wnd, NULL, NULL, RDW_ERASE | RDW_FRAME | RDW_INVALIDATE | RDW_INTERNALPAINT | RDW_ALLCHILDREN);
 }
 
 
diff --git a/Windows/GEDebugger/GEDebugger.cpp b/Windows/GEDebugger/GEDebugger.cpp
index 2a7c32713f..1546019124 100644
--- a/Windows/GEDebugger/GEDebugger.cpp
+++ b/Windows/GEDebugger/GEDebugger.cpp
@@ -59,6 +59,60 @@ enum PrimaryDisplayType {
 	PRIMARY_STENCILBUF,
 };
 
+enum class GEPanelIndex {
+	LEFT,
+	RIGHT,
+	TOPRIGHT,
+	COUNT,
+};
+
+static void *AddDisplayListTab(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, HINSTANCE inst, HWND parent) {
+	HWND wnd = tabs->AddTabWindow(L"CtrlDisplayListView", tab->name);
+	return CtrlDisplayListView::getFrom(wnd);
+}
+
+static void RemoveDisplayListTab(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, void *ptr) {
+	CtrlDisplayListView *view = (CtrlDisplayListView *)ptr;
+	DestroyWindow(view->GetHWND());
+}
+
+static void UpdateDisplayListTab(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, void *ptr) {
+	CtrlDisplayListView *view = (CtrlDisplayListView *)ptr;
+	DisplayList list;
+	if (gpuDebug != nullptr && gpuDebug->GetCurrentDisplayList(list)) {
+		view->setDisplayList(list);
+	}
+}
+
+template <typename T>
+static void *AddStateTab(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, HINSTANCE inst, HWND parent) {
+	T *w = new T(inst, parent);
+	tabs->AddTabDialog(w, tab->name);
+	return w;
+}
+
+static void RemoveStateTab(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, void *ptr) {
+	Dialog *view = (Dialog *)ptr;
+	delete view;
+}
+
+static void UpdateStateTab(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, void *ptr) {
+	Dialog *view = (Dialog *)ptr;
+	view->Update();
+}
+
+static const std::vector<GEDebuggerTab> defaultTabs = {
+	{ L"Display List", GETabPosition::LEFT, GETabType::LIST_DISASM, {}, &AddDisplayListTab, &RemoveDisplayListTab, &UpdateDisplayListTab },
+	{ L"Flags", GETabPosition::LEFT, GETabType::STATE, {}, &AddStateTab<TabStateFlags>, &RemoveStateTab, &UpdateStateTab },
+	{ L"Light", GETabPosition::LEFT, GETabType::STATE, {}, &AddStateTab<TabStateLighting>, &RemoveStateTab, &UpdateStateTab },
+	{ L"Texture", GETabPosition::LEFT, GETabType::STATE, {}, &AddStateTab<TabStateTexture>, &RemoveStateTab, &UpdateStateTab },
+	{ L"Settings", GETabPosition::LEFT, GETabType::STATE, {}, &AddStateTab<TabStateSettings>, &RemoveStateTab, &UpdateStateTab },
+	{ L"Verts", GETabPosition::LEFT, GETabType::STATE, {}, &AddStateTab<TabVertices>, &RemoveStateTab, &UpdateStateTab },
+	{ L"Matrices", GETabPosition::LEFT, GETabType::STATE, {}, &AddStateTab<TabMatrices>, &RemoveStateTab, &UpdateStateTab },
+	{ L"Lists", GETabPosition::LEFT, GETabType::LISTS, {}, &AddStateTab<TabDisplayLists>, &RemoveStateTab, &UpdateStateTab },
+	{ L"Watch", GETabPosition::LEFT, GETabType::WATCH, {}, &AddStateTab<TabStateWatch>, &RemoveStateTab, &UpdateStateTab },
+};
+
 StepCountDlg::StepCountDlg(HINSTANCE _hInstance, HWND _hParent) : Dialog((LPCSTR)IDD_GEDBG_STEPCOUNT, _hInstance, _hParent) {
 	DialogManager::AddDlg(this);
 
@@ -141,14 +195,13 @@ CGEDebugger::CGEDebugger(HINSTANCE _hInstance, HWND _hParent)
 	// up both the size and the aspect ratio
 	RECT frameRect;
 	HWND frameWnd = GetDlgItem(m_hDlg,IDC_GEDBG_FRAME);
-
 	GetWindowRect(frameWnd,&frameRect);
 	MapWindowPoints(HWND_DESKTOP,m_hDlg,(LPPOINT)&frameRect,2);
 	MoveWindow(frameWnd,frameRect.left,frameRect.top,512,272,TRUE);
 
-	tabs = new TabControl(GetDlgItem(m_hDlg,IDC_GEDBG_MAINTAB));
-	HWND wnd = tabs->AddTabWindow(L"CtrlDisplayListView",L"Display List");
-	displayList = CtrlDisplayListView::getFrom(wnd);
+	tabs = new TabControl(GetDlgItem(m_hDlg, IDC_GEDBG_MAINTAB));
+	tabsRight_ = new TabControl(GetDlgItem(m_hDlg, IDC_GEDBG_RIGHTTAB));
+	tabsTR_ = new TabControl(GetDlgItem(m_hDlg, IDC_GEDBG_TOPRIGHTTAB));
 
 	fbTabs = new TabControl(GetDlgItem(m_hDlg, IDC_GEDBG_FBTABS));
 	fbTabs->SetMinTabWidth(50);
@@ -158,31 +211,38 @@ CGEDebugger::CGEDebugger(HINSTANCE _hInstance, HWND _hParent)
 	fbTabs->AddTab(NULL, L"Stencil");
 	fbTabs->ShowTab(0, true);
 
-	flags = new TabStateFlags(_hInstance, m_hDlg);
-	tabs->AddTabDialog(flags, L"Flags");
+	tabStates_ = defaultTabs;
+	// Restore settings, if any set.
+	_assert_msg_(defaultTabs.size() <= 32, "Cannot have more than 32 tabs");
+	if ((g_Config.uGETabsLeft | g_Config.uGETabsRight | g_Config.uGETabsTopRight) != 0) {
+		for (int i = 0; i < (int)tabStates_.size(); ++i) {
+			int mask = 1 << i;
+			tabStates_[i].pos = (GETabPosition)0;
+			if (g_Config.uGETabsLeft & mask)
+				tabStates_[i].pos |= GETabPosition::LEFT;
+			if (g_Config.uGETabsRight & mask)
+				tabStates_[i].pos |= GETabPosition::RIGHT;
+			if (g_Config.uGETabsTopRight & mask)
+				tabStates_[i].pos |= GETabPosition::TOPRIGHT;
+			// If this is a new tab, add it to left.
+			if (tabStates_[i].pos == (GETabPosition)0) {
+				tabStates_[i].pos |= GETabPosition::LEFT;
+				g_Config.uGETabsLeft |= 1 << i;
+			}
+		}
+	} else {
+		g_Config.uGETabsLeft = (1 << tabStates_.size()) - 1;
+	}
+	for (GEDebuggerTab &tabState : tabStates_) {
+		AddTab(&tabState, tabState.pos);
+	}
 
-	lighting = new TabStateLighting(_hInstance, m_hDlg);
-	tabs->AddTabDialog(lighting, L"Lighting");
-
-	textureState = new TabStateTexture(_hInstance, m_hDlg);
-	tabs->AddTabDialog(textureState, L"Texture");
-
-	settings = new TabStateSettings(_hInstance, m_hDlg);
-	tabs->AddTabDialog(settings, L"Settings");
-
-	vertices = new TabVertices(_hInstance, m_hDlg);
-	tabs->AddTabDialog(vertices, L"Vertices");
-
-	matrices = new TabMatrices(_hInstance, m_hDlg);
-	tabs->AddTabDialog(matrices, L"Matrices");
-
-	lists = new TabDisplayLists(_hInstance, m_hDlg);
-	tabs->AddTabDialog(lists, L"Lists");
-
-	watch = new TabStateWatch(_hInstance, m_hDlg);
-	tabs->AddTabDialog(watch, L"Watch");
-
-	tabs->ShowTab(0, true);
+	if (tabs->Count() > 0)
+		tabs->ShowTab(0, true);
+	if (tabsRight_->Count() > 0)
+		tabsRight_->ShowTab(0, true);
+	if (tabsTR_->Count() > 0)
+		tabsTR_->ShowTab(0, true);
 
 	// set window position
 	int x = g_Config.iGEWindowX == -1 ? windowRect.left : g_Config.iGEWindowX;
@@ -198,15 +258,14 @@ CGEDebugger::CGEDebugger(HINSTANCE _hInstance, HWND _hParent)
 
 CGEDebugger::~CGEDebugger() {
 	CleanupPrimPreview();
-	delete flags;
-	delete lighting;
-	delete textureState;
-	delete settings;
-	delete vertices;
-	delete matrices;
-	delete lists;
-	delete watch;
+
+	for (GEDebuggerTab &tabState : tabStates_) {
+		RemoveTab(&tabState, GETabPosition::ALL);
+	}
+
 	delete tabs;
+	delete tabsRight_;
+	delete tabsTR_;
 	delete fbTabs;
 }
 
@@ -353,26 +412,89 @@ void CGEDebugger::UpdatePreviews() {
 		UpdatePrimPreview(primOp, 3);
 	}
 
-	DisplayList list;
-	if (gpuDebug != nullptr && gpuDebug->GetCurrentDisplayList(list)) {
-		displayList->setDisplayList(list);
-	}
-
 	wchar_t primCounter[1024]{};
 	swprintf(primCounter, ARRAY_SIZE(primCounter), L"%d/%d", PrimsThisFrame(), PrimsLastFrame());
 	SetDlgItemText(m_hDlg, IDC_GEDBG_PRIMCOUNTER, primCounter);
 
-	flags->Update();
-	lighting->Update();
-	textureState->Update();
-	settings->Update();
-	vertices->Update();
-	matrices->Update();
-	lists->Update();
-	watch->Update();
+	for (GEDebuggerTab &tabState : tabStates_) {
+		UpdateTab(&tabState);
+	}
+
 	updating_ = false;
 }
 
+void CGEDebugger::UpdateTab(GEDebuggerTab *tab) {
+	auto doUpdate = [&](GETabPosition pos, TabControl *t, GEPanelIndex index) {
+		if (tab->pos & pos)
+			tab->update(tab, t, pos, tab->state[(int)index].ptr);
+	};
+
+	doUpdate(GETabPosition::LEFT, tabs, GEPanelIndex::LEFT);
+	doUpdate(GETabPosition::RIGHT, tabsRight_, GEPanelIndex::RIGHT);
+	doUpdate(GETabPosition::TOPRIGHT, tabsTR_, GEPanelIndex::TOPRIGHT);
+}
+
+void CGEDebugger::AddTab(GEDebuggerTab *tab, GETabPosition mask) {
+	auto doAdd = [&](GETabPosition pos, TabControl *t, GEPanelIndex pindex) {
+		int index = (int)pindex;
+		// On init, we still have nullptr, but already have pos, so we use that.
+		if ((mask & pos) && tab->state[index].ptr == nullptr) {
+			tab->state[index].index = t->Count();
+			tab->state[index].ptr = tab->add(tab, t, pos, m_hInstance, m_hDlg);
+			tab->pos |= pos;
+			t->ShowTab(tab->state[index].index, true);
+			if (gpuDebug)
+				tab->update(tab, t, pos, tab->state[index].ptr);
+		}
+	};
+
+	doAdd(GETabPosition::LEFT, tabs, GEPanelIndex::LEFT);
+	doAdd(GETabPosition::RIGHT, tabsRight_, GEPanelIndex::RIGHT);
+	doAdd(GETabPosition::TOPRIGHT, tabsTR_, GEPanelIndex::TOPRIGHT);
+}
+
+void CGEDebugger::RemoveTab(GEDebuggerTab *tab, GETabPosition mask) {
+	auto doRemove = [&](GETabPosition pos, TabControl *t, GEPanelIndex pindex) {
+		int index = (int)pindex;
+		if ((tab->pos & pos) && (mask & pos)) {
+			auto &state = tab->state[index];
+			_assert_(state.ptr != nullptr);
+			t->RemoveTab(state.index);
+			for (auto &tabState : tabStates_) {
+				if (tabState.state[index].index > state.index)
+					--tabState.state[index].index;
+			}
+
+			tab->remove(tab, t, pos, state.ptr);
+			tab->pos = GETabPosition((int)tab->pos & ~(int)pos);
+			state.ptr = nullptr;
+			state.index = -1;
+		}
+	};
+
+	doRemove(GETabPosition::LEFT, tabs, GEPanelIndex::LEFT);
+	doRemove(GETabPosition::RIGHT, tabsRight_, GEPanelIndex::RIGHT);
+	doRemove(GETabPosition::TOPRIGHT, tabsTR_, GEPanelIndex::TOPRIGHT);
+}
+
+int CGEDebugger::HasTabIndex(GEDebuggerTab *tab, GETabPosition pos) {
+	int stateIndex = 0;
+	switch (pos) {
+	case GETabPosition::LEFT: stateIndex = (int)GEPanelIndex::LEFT; break;
+	case GETabPosition::RIGHT: stateIndex = (int)GEPanelIndex::RIGHT; break;
+	case GETabPosition::TOPRIGHT: stateIndex = (int)GEPanelIndex::TOPRIGHT; break;
+	default: _assert_msg_(false, "Invalid GE tab position"); break;
+	}
+
+	if (tab->pos & pos) {
+		auto &state = tab->state[stateIndex];
+		if (state.ptr == nullptr)
+			return -1;
+		return state.index;
+	}
+	return -1;
+}
+
 u32 CGEDebugger::TexturePreviewFlags(const GPUgstate &state) {
 	if (state.isTextureAlphaUsed() && !forceOpaque_) {
 		return SimpleGLWindow::ALPHA_BLEND | SimpleGLWindow::RESIZE_BEST_CENTER;
@@ -696,16 +818,46 @@ void CGEDebugger::UpdateTextureLevel(int level) {
 }
 
 void CGEDebugger::UpdateSize(WORD width, WORD height) {
-	// only resize the tab for now
+	// only resize the tabs for now
 	HWND tabControl = GetDlgItem(m_hDlg, IDC_GEDBG_MAINTAB);
+	HWND tabControlRight = GetDlgItem(m_hDlg, IDC_GEDBG_RIGHTTAB);
+	HWND tabControlTR = GetDlgItem(m_hDlg, IDC_GEDBG_TOPRIGHTTAB);
 
 	RECT tabRect;
 	GetWindowRect(tabControl,&tabRect);
 	MapWindowPoints(HWND_DESKTOP,m_hDlg,(LPPOINT)&tabRect,2);
 
-	tabRect.right = tabRect.left + (width-tabRect.left*2);				// assume same gap on both sides
-	tabRect.bottom = tabRect.top + (height-tabRect.top-tabRect.left);	// assume same gap on bottom too
-	MoveWindow(tabControl,tabRect.left,tabRect.top,tabRect.right-tabRect.left,tabRect.bottom-tabRect.top,TRUE);
+	// Assume the same gap (tabRect.left) on all sides.
+	if (tabsRight_ && tabsRight_->Count() == 0) {
+		tabRect.right = tabRect.left + (width - tabRect.left * 2);
+	} else {
+		tabRect.right = tabRect.left + (width / 2 - tabRect.left * 2);
+	}
+	tabRect.bottom = tabRect.top + (height - tabRect.top - tabRect.left);
+	
+	RECT tabRectRight = tabRect;
+	if (tabs && tabsRight_ && tabs->Count() == 0 && tabsRight_->Count() != 0) {
+		tabRect.right = tabRect.left;
+		tabRect.bottom = tabRect.top;
+	} else {
+		tabRectRight.left += tabRect.right;
+		tabRectRight.right += tabRect.right + tabRect.left;
+	}
+
+	RECT frameRect;
+	HWND frameWnd = GetDlgItem(m_hDlg, IDC_GEDBG_FRAME);
+	GetWindowRect(frameWnd, &frameRect);
+	MapWindowPoints(HWND_DESKTOP, m_hDlg, (LPPOINT)&frameRect, 2);
+	
+	RECT trRect = { frameRect.right + 10, frameRect.top, tabRectRight.right, tabRectRight.top };
+	if (tabsTR_ && tabsTR_->Count() == 0) {
+		trRect.right = trRect.left;
+		trRect.bottom = trRect.top;
+	}
+
+	MoveWindow(tabControl, tabRect.left, tabRect.top, tabRect.right - tabRect.left, tabRect.bottom - tabRect.top, TRUE);
+	MoveWindow(tabControlRight, tabRectRight.left, tabRectRight.top, tabRectRight.right - tabRectRight.left, tabRectRight.bottom - tabRectRight.top, TRUE);
+	MoveWindow(tabControlTR, trRect.left, trRect.top, trRect.right - trRect.left, trRect.bottom - trRect.top, TRUE);
 }
 
 void CGEDebugger::SavePosition() {
@@ -774,8 +926,20 @@ BOOL CGEDebugger::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) {
 		case IDC_GEDBG_MAINTAB:
 			tabs->HandleNotify(lParam);
 			if (gpuDebug != nullptr) {
-				lists->Update();
+				for (GEDebuggerTab &tabState : tabStates_) {
+					if (tabState.type == GETabType::LISTS)
+						UpdateTab(&tabState);
+				}
 			}
+			CheckTabMessage(tabs, GETabPosition::LEFT, lParam);
+			break;
+		case IDC_GEDBG_RIGHTTAB:
+			tabsRight_->HandleNotify(lParam);
+			CheckTabMessage(tabsRight_, GETabPosition::RIGHT, lParam);
+			break;
+		case IDC_GEDBG_TOPRIGHTTAB:
+			tabsTR_->HandleNotify(lParam);
+			CheckTabMessage(tabsTR_, GETabPosition::TOPRIGHT, lParam);
 			break;
 		case IDC_GEDBG_FBTABS:
 			fbTabs->HandleNotify(lParam);
@@ -957,14 +1121,93 @@ BOOL CGEDebugger::DlgProc(UINT message, WPARAM wParam, LPARAM lParam) {
 
 	case WM_GEDBG_UPDATE_WATCH:
 		// Just a notification to update.
-		if (watch)
-			watch->Update();
+		for (GEDebuggerTab &tabState : tabStates_) {
+			if (tabState.type == GETabType::WATCH)
+				UpdateTab(&tabState);
+		}
 		break;
 	}
 
 	return FALSE;
 }
 
+void CGEDebugger::CheckTabMessage(TabControl *t, GETabPosition pos, LPARAM lParam) {
+	NMHDR *msg = (LPNMHDR)lParam;
+	if (msg->code != NM_RCLICK)
+		return;
+
+	POINT cursorPos;
+	GetCursorPos(&cursorPos);
+	int tabIndex = t->HitTest(cursorPos);
+	if (tabIndex == -1)
+		return;
+
+	// Find the tabState that was clicked on.
+	GEDebuggerTab *tab = nullptr;
+	int tabStateIndex = 0;
+	for (int i = 0; i < (int)tabStates_.size(); ++i) {
+		GEDebuggerTab &tabState = tabStates_[i];
+		int foundIndex = HasTabIndex(&tabState, pos);
+		if (foundIndex == tabIndex) {
+			tab = &tabState;
+			tabStateIndex = i;
+			break;
+		}
+	}
+	// Shouldn't normally happen... maybe we added some other type of tab.
+	if (!tab)
+		return;
+
+	int currentPanels = 0;
+	for (int i = 0; i < (int)GEPanelIndex::COUNT; ++i) {
+		if (tab->state[i].index != -1 && tab->state[i].ptr)
+			currentPanels++;
+	}
+
+	HMENU subMenu = GetContextMenu(ContextMenuID::GEDBG_TABS);
+	static const int itemIDs[] = { ID_GEDBG_SHOWONLEFT, ID_GEDBG_SHOWONRIGHT, ID_GEDBG_SHOWONTOPRIGHT };
+	for (int i = 0; i < (int)GEPanelIndex::COUNT; ++i) {
+		bool active = tab->state[i].index != -1 && tab->state[i].ptr;
+		bool disabled = active && currentPanels == 1;
+		CheckMenuItem(subMenu, itemIDs[i], active ? MF_CHECKED : MF_UNCHECKED);
+		EnableMenuItem(subMenu, itemIDs[i], disabled ? MF_GRAYED : MF_ENABLED);
+	}
+
+	auto toggleState = [&](GEPanelIndex i, GETabPosition pos, uint32_t &configured) {
+		auto &state = tab->state[(int)i];
+		bool removing = state.index != -1 && state.ptr;
+		if (removing) {
+			RemoveTab(tab, pos);
+			configured &= ~(1 << tabStateIndex);
+		} else {
+			AddTab(tab, pos);
+			configured |= 1 << tabStateIndex;
+		}
+
+		RECT rc;
+		GetClientRect(m_hDlg, &rc);
+		UpdateSize(rc.right - rc.left, rc.bottom - rc.top);
+	};
+
+	switch (TriggerContextMenu(ContextMenuID::GEDBG_TABS, m_hDlg, ContextPoint::FromCursor())) {
+	case ID_GEDBG_SHOWONLEFT:
+		toggleState(GEPanelIndex::LEFT, GETabPosition::LEFT, g_Config.uGETabsLeft);
+		break;
+
+	case ID_GEDBG_SHOWONRIGHT:
+		toggleState(GEPanelIndex::RIGHT, GETabPosition::RIGHT, g_Config.uGETabsRight);
+		break;
+
+	case ID_GEDBG_SHOWONTOPRIGHT:
+		toggleState(GEPanelIndex::TOPRIGHT, GETabPosition::TOPRIGHT, g_Config.uGETabsTopRight);
+		break;
+
+	default:
+		// Cancel, that's fine.
+		break;
+	}
+}
+
 void CGEDebugger::UpdateMenus() {
 	CheckMenuItem(GetMenu(m_hDlg), IDC_GEDBG_FLUSHAUTO, MF_BYCOMMAND | (autoFlush_ ? MF_CHECKED : MF_UNCHECKED));
 }
diff --git a/Windows/GEDebugger/GEDebugger.h b/Windows/GEDebugger/GEDebugger.h
index ebf9a2c0d7..c7d70dc3ee 100644
--- a/Windows/GEDebugger/GEDebugger.h
+++ b/Windows/GEDebugger/GEDebugger.h
@@ -44,6 +44,38 @@ class TabMatrices;
 class TabStateWatch;
 struct GPUgstate;
 
+enum class GETabPosition {
+	LEFT = 1,
+	RIGHT = 2,
+	TOPRIGHT = 4,
+	ALL = 7,
+};
+ENUM_CLASS_BITOPS(GETabPosition);
+
+enum class GETabType {
+	LIST_DISASM,
+	LISTS,
+	STATE,
+	WATCH,
+};
+
+struct GEDebuggerTab {
+	const wchar_t *name;
+	GETabPosition pos;
+	GETabType type;
+	struct {
+		union {
+			Dialog *dlg;
+			CtrlDisplayListView *displayList;
+			void *ptr;
+		};
+		int index = -1;
+	} state[3];
+	void *(*add)(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, HINSTANCE inst, HWND parent);
+	void (*remove)(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, void *ptr);
+	void (*update)(GEDebuggerTab *tab, TabControl *tabs, GETabPosition pos, void *ptr);
+};
+
 class StepCountDlg : public Dialog {
 public:
 	StepCountDlg(HINSTANCE _hInstance, HWND _hParent);
@@ -81,24 +113,23 @@ private:
 	void PrimaryPreviewHover(int x, int y);
 	void SecondPreviewHover(int x, int y);
 	void PreviewExport(const GPUDebugBuffer *buffer);
-	void DescribePixel(u32 pix, GPUDebugBufferFormat fmt, int x, int y, char desc[256]);
-	void DescribePixelRGBA(u32 pix, GPUDebugBufferFormat fmt, int x, int y, char desc[256]);
+	static void DescribePixel(u32 pix, GPUDebugBufferFormat fmt, int x, int y, char desc[256]);
+	static void DescribePixelRGBA(u32 pix, GPUDebugBufferFormat fmt, int x, int y, char desc[256]);
 	void UpdateMenus();
+	void UpdateTab(GEDebuggerTab *tab);
+	void AddTab(GEDebuggerTab *tab, GETabPosition mask);
+	void RemoveTab(GEDebuggerTab *tab, GETabPosition mask);
+	int HasTabIndex(GEDebuggerTab *tab, GETabPosition pos);
+	void CheckTabMessage(TabControl *t, GETabPosition pos, LPARAM lParam);
 
 	u32 TexturePreviewFlags(const GPUgstate &state);
 
-	CtrlDisplayListView *displayList = nullptr;
-	TabDisplayLists *lists = nullptr;
-	TabStateFlags *flags = nullptr;
-	TabStateLighting *lighting = nullptr;
-	TabStateTexture *textureState = nullptr;
-	TabStateSettings *settings = nullptr;
-	TabVertices *vertices = nullptr;
-	TabMatrices *matrices = nullptr;
 	SimpleGLWindow *primaryWindow = nullptr;
 	SimpleGLWindow *secondWindow = nullptr;
-	TabStateWatch *watch = nullptr;
+	std::vector<GEDebuggerTab> tabStates_;
 	TabControl *tabs = nullptr;
+	TabControl *tabsRight_ = nullptr;
+	TabControl *tabsTR_ = nullptr;
 	TabControl *fbTabs = nullptr;
 	int textureLevel_ = 0;
 	bool showClut_ = false;
diff --git a/Windows/GEDebugger/TabState.cpp b/Windows/GEDebugger/TabState.cpp
index 486e6030b4..9d6735aabd 100644
--- a/Windows/GEDebugger/TabState.cpp
+++ b/Windows/GEDebugger/TabState.cpp
@@ -177,23 +177,25 @@ static const TabStateRow stateLightingRows[] = {
 };
 
 static const TabStateRow stateTextureRows[] = {
+	{ L"Texture L0 addr",      GE_CMD_TEXADDR0,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH0 },
+	{ L"Texture L0 size",      GE_CMD_TEXSIZE0,                CMD_FMT_TEXSIZE, GE_CMD_TEXTUREMAPENABLE },
+	{ L"Tex format",           GE_CMD_TEXFORMAT,               CMD_FMT_TEXFMT, GE_CMD_TEXTUREMAPENABLE },
+	{ L"Tex CLUT",             GE_CMD_CLUTADDR,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_CLUTADDRUPPER },
+	{ L"Tex CLUT format",      GE_CMD_CLUTFORMAT,              CMD_FMT_CLUTFMT, GE_CMD_TEXTUREMAPENABLE },
+
 	{ L"Tex U scale",          GE_CMD_TEXSCALEU,               CMD_FMT_FLOAT24, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex V scale",          GE_CMD_TEXSCALEV,               CMD_FMT_FLOAT24, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex U offset",         GE_CMD_TEXOFFSETU,              CMD_FMT_FLOAT24, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex V offset",         GE_CMD_TEXOFFSETV,              CMD_FMT_FLOAT24, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex mapping mode",     GE_CMD_TEXMAPMODE,              CMD_FMT_TEXMAPMODE, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex shade srcs",       GE_CMD_TEXSHADELS,              CMD_FMT_TEXSHADELS, GE_CMD_TEXTUREMAPENABLE },
+	{ L"Tex func",             GE_CMD_TEXFUNC,                 CMD_FMT_TEXFUNC, GE_CMD_TEXTUREMAPENABLE },
+	{ L"Tex env color",        GE_CMD_TEXENVCOLOR,             CMD_FMT_HEX, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex mode",             GE_CMD_TEXMODE,                 CMD_FMT_TEXMODE, GE_CMD_TEXTUREMAPENABLE },
-	{ L"Tex format",           GE_CMD_TEXFORMAT,               CMD_FMT_TEXFMT, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex filtering",        GE_CMD_TEXFILTER,               CMD_FMT_TEXFILTER, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex wrapping",         GE_CMD_TEXWRAP,                 CMD_FMT_TEXWRAP, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex level/bias",       GE_CMD_TEXLEVEL,                CMD_FMT_TEXLEVEL, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Tex lod slope",        GE_CMD_TEXLODSLOPE,             CMD_FMT_FLOAT24, GE_CMD_TEXTUREMAPENABLE },
-	{ L"Tex func",             GE_CMD_TEXFUNC,                 CMD_FMT_TEXFUNC, GE_CMD_TEXTUREMAPENABLE },
-	{ L"Tex env color",        GE_CMD_TEXENVCOLOR,             CMD_FMT_HEX, GE_CMD_TEXTUREMAPENABLE },
-	{ L"CLUT",                 GE_CMD_CLUTADDR,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_CLUTADDRUPPER },
-	{ L"CLUT format",          GE_CMD_CLUTFORMAT,              CMD_FMT_CLUTFMT, GE_CMD_TEXTUREMAPENABLE },
-	{ L"Texture L0 addr",      GE_CMD_TEXADDR0,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH0 },
 	{ L"Texture L1 addr",      GE_CMD_TEXADDR1,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH1 },
 	{ L"Texture L2 addr",      GE_CMD_TEXADDR2,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH2 },
 	{ L"Texture L3 addr",      GE_CMD_TEXADDR3,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH3 },
@@ -201,7 +203,6 @@ static const TabStateRow stateTextureRows[] = {
 	{ L"Texture L5 addr",      GE_CMD_TEXADDR5,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH5 },
 	{ L"Texture L6 addr",      GE_CMD_TEXADDR6,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH6 },
 	{ L"Texture L7 addr",      GE_CMD_TEXADDR7,                CMD_FMT_PTRWIDTH, GE_CMD_TEXTUREMAPENABLE, GE_CMD_TEXBUFWIDTH7 },
-	{ L"Texture L0 size",      GE_CMD_TEXSIZE0,                CMD_FMT_TEXSIZE, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Texture L1 size",      GE_CMD_TEXSIZE1,                CMD_FMT_TEXSIZE, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Texture L2 size",      GE_CMD_TEXSIZE2,                CMD_FMT_TEXSIZE, GE_CMD_TEXTUREMAPENABLE },
 	{ L"Texture L3 size",      GE_CMD_TEXSIZE3,                CMD_FMT_TEXSIZE, GE_CMD_TEXTUREMAPENABLE },
@@ -212,27 +213,34 @@ static const TabStateRow stateTextureRows[] = {
 };
 
 static const TabStateRow stateSettingsRows[] = {
-	{ L"Clear mode",           GE_CMD_CLEARMODE,               CMD_FMT_CLEARMODE },
 	{ L"Framebuffer",          GE_CMD_FRAMEBUFPTR,             CMD_FMT_PTRWIDTH, 0, GE_CMD_FRAMEBUFWIDTH },
 	{ L"Framebuffer format",   GE_CMD_FRAMEBUFPIXFORMAT,       CMD_FMT_TEXFMT },
 	{ L"Depthbuffer",          GE_CMD_ZBUFPTR,                 CMD_FMT_PTRWIDTH, 0, GE_CMD_ZBUFWIDTH },
+	{ L"Viewport Scale",       GE_CMD_VIEWPORTXSCALE,          CMD_FMT_XYZ, 0, GE_CMD_VIEWPORTYSCALE, GE_CMD_VIEWPORTZSCALE },
+	{ L"Viewport Offset",      GE_CMD_VIEWPORTXCENTER,         CMD_FMT_XYZ, 0, GE_CMD_VIEWPORTYCENTER, GE_CMD_VIEWPORTZCENTER },
+	{ L"Scissor",              GE_CMD_SCISSOR1,                CMD_FMT_XYXY, 0, GE_CMD_SCISSOR2 },
+	{ L"Region",               GE_CMD_REGION1,                 CMD_FMT_XYXY, 0, GE_CMD_REGION2 },
+	{ L"Color test",           GE_CMD_COLORTEST,               CMD_FMT_COLORTEST, GE_CMD_COLORTESTENABLE, GE_CMD_COLORREF, GE_CMD_COLORTESTMASK },
+	{ L"Alpha test",           GE_CMD_ALPHATEST,               CMD_FMT_ALPHATEST, GE_CMD_ALPHATESTENABLE },
+	{ L"Clear mode",           GE_CMD_CLEARMODE,               CMD_FMT_CLEARMODE },
+	{ L"Stencil test",         GE_CMD_STENCILTEST,             CMD_FMT_STENCILTEST, GE_CMD_STENCILTESTENABLE },
+	{ L"Stencil test op",      GE_CMD_STENCILOP,               CMD_FMT_STENCILOP, GE_CMD_STENCILTESTENABLE },
+	{ L"Depth test",           GE_CMD_ZTEST,                   CMD_FMT_ZTEST, GE_CMD_ZTESTENABLE },
+	{ L"RGB mask",             GE_CMD_MASKRGB,                 CMD_FMT_HEX },
+	{ L"Stencil/alpha mask",   GE_CMD_MASKALPHA,               CMD_FMT_HEX },
+	{ L"Transfer src",         GE_CMD_TRANSFERSRC,             CMD_FMT_PTRWIDTH, 0, GE_CMD_TRANSFERSRCW },
+	{ L"Transfer src pos",     GE_CMD_TRANSFERSRCPOS,          CMD_FMT_XY },
+	{ L"Transfer dst",         GE_CMD_TRANSFERDST,             CMD_FMT_PTRWIDTH, 0, GE_CMD_TRANSFERDSTW },
+	{ L"Transfer dst pos",     GE_CMD_TRANSFERDSTPOS,          CMD_FMT_XY },
+	{ L"Transfer size",        GE_CMD_TRANSFERSIZE,            CMD_FMT_XY },
 	{ L"Vertex type",          GE_CMD_VERTEXTYPE,              CMD_FMT_VERTEXTYPE },
 	{ L"Offset addr",          GE_CMD_OFFSETADDR,              CMD_FMT_OFFSETADDR },
 	{ L"Vertex addr",          GE_CMD_VADDR,                   CMD_FMT_VADDR },
 	{ L"Index addr",           GE_CMD_IADDR,                   CMD_FMT_IADDR },
-	{ L"Region",               GE_CMD_REGION1,                 CMD_FMT_XYXY, 0, GE_CMD_REGION2 },
-	{ L"Scissor",              GE_CMD_SCISSOR1,                CMD_FMT_XYXY, 0, GE_CMD_SCISSOR2 },
 	{ L"Min Z",                GE_CMD_MINZ,                    CMD_FMT_HEX },
 	{ L"Max Z",                GE_CMD_MAXZ,                    CMD_FMT_HEX },
-	{ L"Viewport Scale",       GE_CMD_VIEWPORTXSCALE,          CMD_FMT_XYZ, 0, GE_CMD_VIEWPORTYSCALE, GE_CMD_VIEWPORTZSCALE },
-	{ L"Viewport Offset",      GE_CMD_VIEWPORTXCENTER,         CMD_FMT_XYZ, 0, GE_CMD_VIEWPORTYCENTER, GE_CMD_VIEWPORTZCENTER },
 	{ L"Offset",               GE_CMD_OFFSETX,                 CMD_FMT_F16_XY, 0, GE_CMD_OFFSETY },
 	{ L"Cull mode",            GE_CMD_CULL,                    CMD_FMT_CULL, GE_CMD_CULLFACEENABLE },
-	{ L"Color test",           GE_CMD_COLORTEST,               CMD_FMT_COLORTEST, GE_CMD_COLORTESTENABLE, GE_CMD_COLORREF, GE_CMD_COLORTESTMASK },
-	{ L"Alpha test",           GE_CMD_ALPHATEST,               CMD_FMT_ALPHATEST, GE_CMD_ALPHATESTENABLE },
-	{ L"Stencil test",         GE_CMD_STENCILTEST,             CMD_FMT_STENCILTEST, GE_CMD_STENCILTESTENABLE },
-	{ L"Stencil test op",      GE_CMD_STENCILOP,               CMD_FMT_STENCILOP, GE_CMD_STENCILTESTENABLE },
-	{ L"Depth test",           GE_CMD_ZTEST,                   CMD_FMT_ZTEST, GE_CMD_ZTESTENABLE },
 	{ L"Alpha blend mode",     GE_CMD_BLENDMODE,               CMD_FMT_BLENDMODE, GE_CMD_ALPHABLENDENABLE },
 	{ L"Blend color A",        GE_CMD_BLENDFIXEDA,             CMD_FMT_HEX, GE_CMD_ALPHABLENDENABLE },
 	{ L"Blend color B",        GE_CMD_BLENDFIXEDB,             CMD_FMT_HEX, GE_CMD_ALPHABLENDENABLE },
@@ -240,8 +248,6 @@ static const TabStateRow stateSettingsRows[] = {
 	{ L"Fog 1",                GE_CMD_FOG1,                    CMD_FMT_FLOAT24, GE_CMD_FOGENABLE },
 	{ L"Fog 2",                GE_CMD_FOG2,                    CMD_FMT_FLOAT24, GE_CMD_FOGENABLE },
 	{ L"Fog color",            GE_CMD_FOGCOLOR,                CMD_FMT_HEX, GE_CMD_FOGENABLE },
-	{ L"RGB mask",             GE_CMD_MASKRGB,                 CMD_FMT_HEX },
-	{ L"Stencil/alpha mask",   GE_CMD_MASKALPHA,               CMD_FMT_HEX },
 	{ L"Morph Weight 0",       GE_CMD_MORPHWEIGHT0,            CMD_FMT_FLOAT24 },
 	{ L"Morph Weight 1",       GE_CMD_MORPHWEIGHT1,            CMD_FMT_FLOAT24 },
 	{ L"Morph Weight 2",       GE_CMD_MORPHWEIGHT2,            CMD_FMT_FLOAT24 },
@@ -259,11 +265,6 @@ static const TabStateRow stateSettingsRows[] = {
 	{ L"Dither 1",             GE_CMD_DITH1,                   CMD_FMT_HEX, GE_CMD_DITHERENABLE },
 	{ L"Dither 2",             GE_CMD_DITH2,                   CMD_FMT_HEX, GE_CMD_DITHERENABLE },
 	{ L"Dither 3",             GE_CMD_DITH3,                   CMD_FMT_HEX, GE_CMD_DITHERENABLE },
-	{ L"Transfer src",         GE_CMD_TRANSFERSRC,             CMD_FMT_PTRWIDTH, 0, GE_CMD_TRANSFERSRCW },
-	{ L"Transfer src pos",     GE_CMD_TRANSFERSRCPOS,          CMD_FMT_XY },
-	{ L"Transfer dst",         GE_CMD_TRANSFERDST,             CMD_FMT_PTRWIDTH, 0, GE_CMD_TRANSFERDSTW },
-	{ L"Transfer dst pos",     GE_CMD_TRANSFERDSTPOS,          CMD_FMT_XY },
-	{ L"Transfer size",        GE_CMD_TRANSFERSIZE,            CMD_FMT_XY },
 };
 
 // TODO: Commands not present in the above lists (some because they don't have meaningful values...):
@@ -1013,7 +1014,7 @@ void CtrlStateValues::OnRightClick(int row, int column, const POINT &point) {
 }
 
 bool CtrlStateValues::OnRowPrePaint(int row, LPNMLVCUSTOMDRAW msg) {
-	if (RowValuesChanged(row)) {
+	if (gpuDebug && RowValuesChanged(row)) {
 		msg->clrText = RGB(255, 0, 0);
 		return true;
 	}
diff --git a/Windows/GEDebugger/TabState.h b/Windows/GEDebugger/TabState.h
index c60c849028..dbc1558fa0 100644
--- a/Windows/GEDebugger/TabState.h
+++ b/Windows/GEDebugger/TabState.h
@@ -57,7 +57,7 @@ public:
 	TabStateValues(const TabStateRow *rows, int rowCount, LPCSTR dialogID, HINSTANCE _hInstance, HWND _hParent);
 	~TabStateValues();
 
-	virtual void Update() {
+	void Update() override {
 		values->Update();
 	}
 
diff --git a/Windows/W32Util/ContextMenu.h b/Windows/W32Util/ContextMenu.h
index f8fbe46488..9e52e2aa47 100644
--- a/Windows/W32Util/ContextMenu.h
+++ b/Windows/W32Util/ContextMenu.h
@@ -31,6 +31,7 @@ enum class ContextMenuID {
 	GEDBG_STATE = 7,
 	GEDBG_PREVIEW = 8,
 	GEDBG_MATRIX = 9,
+	GEDBG_TABS = 10,
 };
 
 struct ContextPoint {
diff --git a/Windows/W32Util/DialogManager.h b/Windows/W32Util/DialogManager.h
index fc943b3ddd..55497223ac 100644
--- a/Windows/W32Util/DialogManager.h
+++ b/Windows/W32Util/DialogManager.h
@@ -18,6 +18,7 @@ protected:
 	virtual void Create();
 	void Destroy();
 
+	HINSTANCE m_hInstance;
 	HWND m_hParent;
 	HWND m_hDlg;
 	LPCSTR m_hResource;
@@ -26,9 +27,6 @@ protected:
 
 	virtual BOOL DlgProc(UINT message, WPARAM wParam, LPARAM lParam) = 0;
 	static INT_PTR CALLBACK DlgProcStatic(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
-
-private:
-	HINSTANCE m_hInstance;
 };
 
 
diff --git a/Windows/W32Util/Misc.cpp b/Windows/W32Util/Misc.cpp
index 37bdfd475e..657a0193d2 100644
--- a/Windows/W32Util/Misc.cpp
+++ b/Windows/W32Util/Misc.cpp
@@ -204,6 +204,7 @@ GenericListControl::GenericListControl(HWND hwnd, const GenericListViewDef& def)
 }
 
 GenericListControl::~GenericListControl() {
+	SetWindowLongPtr(handle, GWLP_USERDATA, (LONG_PTR)nullptr);
 	// Don't destroy the image list, it's done automatically by the list view.
 }
 
@@ -376,6 +377,8 @@ void GenericListControl::ResizeColumns()
 LRESULT CALLBACK GenericListControl::wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	GenericListControl* list = (GenericListControl*) GetWindowLongPtr(hwnd,GWLP_USERDATA);
+	if (!list)
+		return FALSE;
 
 	LRESULT returnValue;
 	if (list->valid && list->WindowMessage(msg,wParam,lParam,returnValue) == true)
diff --git a/Windows/W32Util/TabControl.cpp b/Windows/W32Util/TabControl.cpp
index 2d315213df..d4556725b6 100644
--- a/Windows/W32Util/TabControl.cpp
+++ b/Windows/W32Util/TabControl.cpp
@@ -93,6 +93,27 @@ void TabControl::AddTab(HWND handle, const wchar_t* title)
 	ShowTab(index);
 }
 
+HWND TabControl::RemoveTab(int index) {
+	int prevIndex = CurrentTabIndex();
+	if (currentTab >= index)
+		--currentTab;
+
+	HWND prevHandle = tabs[index].pageHandle;
+	if (tabs.size() == 1) {
+		TabCtrl_DeleteAllItems(hwnd);
+		tabs.clear();
+		currentTab = 0;
+	} else {
+		TabCtrl_DeleteItem(hwnd, index);
+		tabs.erase(tabs.begin() + index);
+
+		if (prevIndex == index)
+			ShowTab(currentTab, true);
+	}
+
+	return prevHandle;
+}
+
 int TabControl::AppendPageToControl(const wchar_t *title)
 {
 	TCITEM tcItem;
@@ -257,6 +278,14 @@ void TabControl::HandleNotify(LPARAM lParam)
 	}
 }
 
+int TabControl::HitTest(const POINT &screenPos) {
+	TCHITTESTINFO hitTest{};
+	hitTest.pt = screenPos;
+	ScreenToClient(hwnd, &hitTest.pt);
+
+	return TabCtrl_HitTest(hwnd, &hitTest);
+}
+
 void TabControl::OnResize()
 {
 	RECT tabRect;
diff --git a/Windows/W32Util/TabControl.h b/Windows/W32Util/TabControl.h
index 7eb2360dcf..3d4b26f93e 100644
--- a/Windows/W32Util/TabControl.h
+++ b/Windows/W32Util/TabControl.h
@@ -11,9 +11,11 @@ class TabControl
 public:
 	TabControl(HWND handle, bool noDisplayArea = false);
 	void HandleNotify(LPARAM lParam);
+	int HitTest(const POINT &screenPos);
 	HWND AddTabWindow(const wchar_t* className, const wchar_t* title, DWORD style = 0);
 	void AddTabDialog(Dialog* dialog, const wchar_t* title);
 	void AddTab(HWND hwnd, const wchar_t* title);
+	HWND RemoveTab(int index);
 	void ShowTab(int index, bool setControlIndex = true);
 	void ShowTab(HWND pageHandle);
 	void NextTab(bool cycle);
@@ -30,6 +32,10 @@ public:
 	bool GetShowTabTitles() { return showTabTitles; }
 	void SetMinTabWidth(int w);
 
+	int Count() {
+		return (int)tabs.size();
+	}
+
 private:
 	static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 	void OnResize();
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index b306c1a7f5..e2f38fd8e6 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -196,7 +196,7 @@ BEGIN
     CONTROL         "",IDC_DEBUG_BOTTOMTABS,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,1,338,513,93
 END
 
-IDD_GEDEBUGGER DIALOGEX 0, 0, 500, 400
+IDD_GEDEBUGGER DIALOGEX 0, 0, 490, 400
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 EXSTYLE WS_EX_ACCEPTFILES | WS_EX_TOOLWINDOW
 CAPTION "GE"
@@ -212,7 +212,9 @@ BEGIN
     PUSHBUTTON      "&Resume",IDC_GEDBG_RESUME,444,2,44,14
     CONTROL         "",IDC_GEDBG_TEX,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,10,20,128,128
     CONTROL         "",IDC_GEDBG_FRAME,"SimpleGLWindow",WS_CHILD | WS_VISIBLE,148,20,256,136
-    CONTROL         "",IDC_GEDBG_MAINTAB,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,10,216,480,180
+    CONTROL         "",IDC_GEDBG_TOPRIGHTTAB,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,500,20,280,136
+    CONTROL         "",IDC_GEDBG_MAINTAB,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,10,216,280,180
+    CONTROL         "",IDC_GEDBG_RIGHTTAB,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,210,216,280,180
     EDITTEXT        IDC_GEDBG_FRAMEBUFADDR,148,192,200,12,ES_READONLY | NOT WS_BORDER
     EDITTEXT        IDC_GEDBG_TEXADDR,10,152,128,12,ES_READONLY | NOT WS_BORDER
     CONTROL         "Force opaque",IDC_GEDBG_FORCEOPAQUE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,164,60,12
@@ -790,6 +792,12 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Toggle Breakpoint",          ID_DISASM_TOGGLEBREAKPOINT
     END
+    POPUP "getaboptions"
+    BEGIN
+        MENUITEM "Show in &Left Pane"          ID_GEDBG_SHOWONLEFT
+        MENUITEM "Show in &Right Pane"         ID_GEDBG_SHOWONRIGHT
+        MENUITEM "Show in &Top Right Pane"     ID_GEDBG_SHOWONTOPRIGHT
+    END
 END
 
 #endif    // English (United States) resources
diff --git a/Windows/resource.h b/Windows/resource.h
index 29879fdc57..eacb42760b 100644
--- a/Windows/resource.h
+++ b/Windows/resource.h
@@ -264,7 +264,6 @@
 #define ID_OPTIONS_BUFLINEARFILTER       40152
 #define ID_OPTIONS_BUFNEARESTFILTER      40153
 #define ID_OPTIONS_DIRECT3D9             40154
-#define ID_OPTIONS_DIRECT3D11            40169
 #define ID_OPTIONS_OPENGL                40155
 #define ID_EMULATION_ROTATION_H          40156
 #define ID_EMULATION_ROTATION_V          40157
@@ -326,6 +325,13 @@
 #define IDC_GEDBG_FLUSHAUTO              40213
 #define IDI_BREAKPOINT_SMALL             40214
 #define IDC_GEDBG_SETPRIMFILTER          40215
+#define IDC_GEDBG_RIGHTTAB               40216
+#define ID_OPTIONS_DIRECT3D11            40217
+#define IDC_GEDBG_TOPRIGHTTAB            40218
+#define ID_GEDBG_SHOWONLEFT              40219
+#define ID_GEDBG_SHOWONRIGHT             40220
+#define ID_GEDBG_SHOWONTOPRIGHT          40221
+
 
 // Dummy option to let the buffered rendering hotkey cycle through all the options.
 #define ID_OPTIONS_BUFFEREDRENDERINGDUMMY 40500
@@ -338,7 +344,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        256
-#define _APS_NEXT_COMMAND_VALUE         40216
+#define _APS_NEXT_COMMAND_VALUE         40222
 #define _APS_NEXT_CONTROL_VALUE         1202
 #define _APS_NEXT_SYMED_VALUE           101
 #endif