diff --git a/Source/Core/DebuggerWX/src/BreakpointWindow.cpp b/Source/Core/DebuggerWX/src/BreakpointWindow.cpp
index e752f1bbdb..7017057561 100644
--- a/Source/Core/DebuggerWX/src/BreakpointWindow.cpp
+++ b/Source/Core/DebuggerWX/src/BreakpointWindow.cpp
@@ -6,6 +6,7 @@
 #include "BreakPointWindow.h"
 #include "BreakpointView.h"
 #include "CodeWindow.h"
+#include "HW/Memmap.h"
 
 #include "wx/mstream.h"
 
@@ -75,10 +76,15 @@ CBreakPointWindow::PopulateToolbar(wxToolBar* toolBar)
 		h = m_Bitmaps[Toolbar_Delete].GetHeight();
 
 	toolBar->SetToolBitmapSize(wxSize(w, h));
-	toolBar->AddTool(IDM_DELETE, _T("Delete"), m_Bitmaps[Toolbar_Delete], _T("Refresh"));
+	toolBar->AddTool(IDM_DELETE, _T("Delete"), m_Bitmaps[Toolbar_Delete], _T("Delete the selected BreakPoint or MemoryCheck"));
 	toolBar->AddSeparator();
-	toolBar->AddTool(IDM_ADD_BREAKPOINT,    _T("BP"),    m_Bitmaps[Toolbar_Add_BreakPoint], _T("Open file..."));
-	toolBar->AddTool(IDM_ADD_MEMORYCHECK, _T("MemCheck"), m_Bitmaps[Toolbar_Add_Memcheck], _T("Refresh"));
+	toolBar->AddTool(IDM_ADD_BREAKPOINT,    _T("BP"),    m_Bitmaps[Toolbar_Add_BreakPoint], _T("Add BreakPoint..."));
+
+    // just add memory breakpoints if you can use them
+    if (Memory::AreMemoryBreakpointsActivated())
+    {
+	    toolBar->AddTool(IDM_ADD_MEMORYCHECK, _T("MC"), m_Bitmaps[Toolbar_Add_Memcheck], _T("Add MemoryCheck..."));
+    }
 
 	// after adding the buttons to the toolbar, must call Realize() to reflect
 	// the changes
diff --git a/Source/Core/DebuggerWX/src/CodeWindow.cpp b/Source/Core/DebuggerWX/src/CodeWindow.cpp
index 319f609691..1f76422786 100644
--- a/Source/Core/DebuggerWX/src/CodeWindow.cpp
+++ b/Source/Core/DebuggerWX/src/CodeWindow.cpp
@@ -69,19 +69,19 @@ enum
 };
 
 BEGIN_EVENT_TABLE(CCodeWindow, wxFrame)
-EVT_BUTTON(IDM_DEBUG_GO,        CCodeWindow::OnCodeStep)
-EVT_BUTTON(IDM_STEP,            CCodeWindow::OnCodeStep)
-EVT_BUTTON(IDM_STEPOVER,        CCodeWindow::OnCodeStep)
-EVT_BUTTON(IDM_SKIP,            CCodeWindow::OnCodeStep)
-EVT_BUTTON(IDM_SETPC,           CCodeWindow::OnCodeStep)
-EVT_BUTTON(IDM_GOTOPC,          CCodeWindow::OnCodeStep)
-EVT_TEXT(IDM_ADDRBOX,           CCodeWindow::OnAddrBoxChange)
-EVT_LISTBOX(IDM_SYMBOLLIST,     CCodeWindow::OnSymolListChange)
-EVT_LISTBOX(IDM_CALLSTACKLIST,  CCodeWindow::OnCallstackListChange)
-EVT_HOST_COMMAND(wxID_ANY,      CCodeWindow::OnHostMessage)
-EVT_MENU(IDM_LOGWINDOW,         CCodeWindow::OnToggleLogWindow)
-EVT_MENU(IDM_REGISTERWINDOW,    CCodeWindow::OnToggleRegisterWindow)
-EVT_MENU(IDM_BREAKPOINTWINDOW,  CCodeWindow::OnToggleBreakPointWindow)
+    EVT_BUTTON(IDM_DEBUG_GO,        CCodeWindow::OnCodeStep)
+    EVT_BUTTON(IDM_STEP,            CCodeWindow::OnCodeStep)
+    EVT_BUTTON(IDM_STEPOVER,        CCodeWindow::OnCodeStep)
+    EVT_BUTTON(IDM_SKIP,            CCodeWindow::OnCodeStep)
+    EVT_BUTTON(IDM_SETPC,           CCodeWindow::OnCodeStep)
+    EVT_BUTTON(IDM_GOTOPC,          CCodeWindow::OnCodeStep)
+    EVT_TEXT(IDM_ADDRBOX,           CCodeWindow::OnAddrBoxChange)
+    EVT_LISTBOX(IDM_SYMBOLLIST,     CCodeWindow::OnSymolListChange)
+    EVT_LISTBOX(IDM_CALLSTACKLIST,  CCodeWindow::OnCallstackListChange)
+    EVT_HOST_COMMAND(wxID_ANY,      CCodeWindow::OnHostMessage)
+    EVT_MENU(IDM_LOGWINDOW,         CCodeWindow::OnToggleLogWindow)
+    EVT_MENU(IDM_REGISTERWINDOW,    CCodeWindow::OnToggleRegisterWindow)
+    EVT_MENU(IDM_BREAKPOINTWINDOW,  CCodeWindow::OnToggleBreakPointWindow)
 END_EVENT_TABLE()