diff --git a/pcsx2/gui/Debugger/DebuggerLists.cpp b/pcsx2/gui/Debugger/DebuggerLists.cpp
index 488e5f2534..6528d7f8e4 100644
--- a/pcsx2/gui/Debugger/DebuggerLists.cpp
+++ b/pcsx2/gui/Debugger/DebuggerLists.cpp
@@ -612,3 +612,108 @@ void ThreadList::onDoubleClick(int itemIndex, const wxPoint& point)
 		break;
 	}
 }
+
+EEThread ThreadList::getRunningThread()
+{
+	for (size_t i = 0; i < threads.size(); i++)
+	{
+		if (threads[i].data.status == THS_RUN)
+			return threads[i];
+	}
+
+	EEThread thread;
+	memset(&thread,0,sizeof(thread));
+	thread.tid = -1;
+	return thread;
+}
+
+//
+// StackFramesList
+//
+
+enum { SF_ENTRY, SF_ENTRYNAME, SF_CURPC, SF_CUROPCODE, SF_CURSP, SF_FRAMESIZE, SF_COLUMNCOUNT };
+
+GenericListViewColumn stackFrameolumns[SF_COLUMNCOUNT] = {
+	{ L"Entry",			0.12f },
+	{ L"Name",			0.24f },
+	{ L"PC",			0.12f },
+	{ L"Opcode",		0.28f },
+	{ L"SP",			0.12f },
+	{ L"Frame Size",	0.12f }
+};
+
+StackFramesList::StackFramesList(wxWindow* parent, DebugInterface* _cpu, CtrlDisassemblyView* _disassembly)
+	: GenericListView(parent,stackFrameolumns,SF_COLUMNCOUNT), cpu(_cpu), disassembly(_disassembly)
+{
+#ifdef __linux__
+	// On linux wx failed to resize properly the page. I don't know why so for the moment I just create a static size page
+	// Far from ideal but at least I can use the memory window!
+	this->SetSize(wxSize(1000, 200));
+#endif
+}
+
+void StackFramesList::loadStackFrames(EEThread& currentThread)
+{
+	frames = MipsStackWalk::Walk(cpu,cpu->getPC(),cpu->getRegister(0,31),cpu->getRegister(0,29),
+			currentThread.data.entry_init,currentThread.data.stack);
+	update();
+}
+
+int StackFramesList::getRowCount()
+{
+	return frames.size();
+}
+
+wxString StackFramesList::getColumnText(int item, int col) const
+{
+	if (item < 0 || item >= (int)frames.size())
+		return L"";
+
+	FastFormatUnicode dest;
+	const MipsStackWalk::StackFrame& frame = frames[item];
+
+	switch (col)
+	{
+	case SF_ENTRY:
+		dest.Write("0x%08X",frame.entry);
+		break;
+	case SF_ENTRYNAME:
+		{
+			const std::string sym = symbolMap.GetLabelString(frame.entry);
+			if (!sym.empty()) {
+				dest.Write("%s",sym.c_str());
+			} else {
+				dest.Write("-");
+			}
+		}
+		break;
+	case SF_CURPC:
+		dest.Write("0x%08X",frame.pc);
+		break;
+	case SF_CUROPCODE:
+		{
+			char temp[512];
+			disassembly->getOpcodeText(frame.pc,temp);
+			dest.Write("%s",temp);
+		}
+		break;
+	case SF_CURSP:
+		dest.Write("0x%08X",frame.sp);
+		break;
+	case SF_FRAMESIZE:
+		dest.Write("0x%08X",frame.stackSize);
+		break;
+	default:
+		return L"Invalid";
+	}
+
+	return dest;
+}
+
+void StackFramesList::onDoubleClick(int itemIndex, const wxPoint& point)
+{
+	if (itemIndex < 0 || itemIndex >= (int)frames.size())
+		return;
+	
+	postEvent(debEVT_GOTOINDISASM,frames[itemIndex].pc);
+}
diff --git a/pcsx2/gui/Debugger/DebuggerLists.h b/pcsx2/gui/Debugger/DebuggerLists.h
index f48320df9e..0036c2e609 100644
--- a/pcsx2/gui/Debugger/DebuggerLists.h
+++ b/pcsx2/gui/Debugger/DebuggerLists.h
@@ -18,6 +18,7 @@
 #include "DebugTools/DebugInterface.h"
 #include "DebugTools/Breakpoints.h"
 #include "DebugTools/BiosDebugData.h"
+#include "DebugTools/MipsStackWalk.h"
 #include "CtrlDisassemblyView.h"
 
 struct GenericListViewColumn
@@ -88,6 +89,7 @@ class ThreadList: public GenericListView
 public:
 	ThreadList(wxWindow* parent, DebugInterface* _cpu);
 	void reloadThreads();
+	EEThread getRunningThread();
 protected:
 	void onPopupClick(wxCommandEvent& evt);
 	
@@ -98,3 +100,20 @@ private:
 	DebugInterface* cpu;
 	std::vector<EEThread> threads;
 };
+
+class StackFramesList: public GenericListView
+{
+public:
+	StackFramesList(wxWindow* parent, DebugInterface* _cpu,  CtrlDisassemblyView* _disassembly);
+	void loadStackFrames(EEThread& currentThread);
+protected:
+	void onPopupClick(wxCommandEvent& evt);
+	
+	virtual wxString getColumnText(int row, int col) const;
+	virtual int getRowCount();
+	virtual void onDoubleClick(int itemIndex, const wxPoint& point);
+private:
+	DebugInterface* cpu;
+	CtrlDisassemblyView* disassembly;
+	std::vector<MipsStackWalk::StackFrame> frames;
+};
diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.cpp b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
index f5ec5ddc87..9317947c8d 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.cpp
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.cpp
@@ -19,6 +19,7 @@
 #include "DebugTools/DebugInterface.h"
 #include "DebugTools/DisassemblyManager.h"
 #include "DebugTools/Breakpoints.h"
+#include "DebugTools/MipsStackWalk.h"
 #include "BreakpointWindow.h"
 #include "PathDefs.h"
 
@@ -109,10 +110,14 @@ CpuTabPage::CpuTabPage(wxWindow* parent, DebugInterface* _cpu)
 	bottomTabs->AddPage(breakpointList,L"Breakpoints");
 	
 	threadList = NULL;
+	stackFrames = NULL;
 	if (cpu == &r5900Debug)
 	{
 		threadList = new ThreadList(bottomTabs,cpu);
 		bottomTabs->AddPage(threadList,L"Threads");
+
+		stackFrames = new StackFramesList(bottomTabs,cpu,disassembly);
+		bottomTabs->AddPage(stackFrames,L"Stack frames");
 	}
 
 	mainSizer->Add(bottomTabs,1,wxEXPAND);
@@ -171,8 +176,13 @@ void CpuTabPage::update()
 	breakpointList->reloadBreakpoints();
 
 	if (threadList != NULL)
+	{
 		threadList->reloadThreads();
 
+		EEThread thread = threadList->getRunningThread();
+		if (thread.tid != -1)
+			stackFrames->loadStackFrames(thread);
+	}
 	Refresh();
 }
 
diff --git a/pcsx2/gui/Debugger/DisassemblyDialog.h b/pcsx2/gui/Debugger/DisassemblyDialog.h
index 4484daa209..94ab959160 100644
--- a/pcsx2/gui/Debugger/DisassemblyDialog.h
+++ b/pcsx2/gui/Debugger/DisassemblyDialog.h
@@ -60,6 +60,7 @@ private:
 	BreakpointList* breakpointList;
 	wxStaticText* cyclesText;
 	ThreadList* threadList;
+	StackFramesList* stackFrames;
 	u32 lastCycles;
 };