diff --git a/Source/Core/DolphinWX/Src/GameListCtrl.cpp b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
index c5618d179f..16ca736246 100644
--- a/Source/Core/DolphinWX/Src/GameListCtrl.cpp
+++ b/Source/Core/DolphinWX/Src/GameListCtrl.cpp
@@ -721,7 +721,7 @@ void CGameListCtrl::OnMouseMotion(wxMouseEvent& event)
 	{
 		if (subitem == COLUMN_EMULATION_STATE)
 		{
-			if (toolTip || lastItem == item) {
+			if (toolTip || lastItem == item || this != FindFocus()) {
 				event.Skip();
 				return;
 			}
diff --git a/Source/Core/DolphinWX/Src/ISOProperties.cpp b/Source/Core/DolphinWX/Src/ISOProperties.cpp
index fcf908db3e..9e0d2ce656 100644
--- a/Source/Core/DolphinWX/Src/ISOProperties.cpp
+++ b/Source/Core/DolphinWX/Src/ISOProperties.cpp
@@ -1049,6 +1049,7 @@ void CISOProperties::PatchButtonClicked(wxCommandEvent& event)
 		break;
 	case ID_REMOVEPATCH:
 		onFrame.erase(onFrame.begin() + Patches->GetSelection());
+		Patches->Delete(Cheats->GetSelection());
 		break;
 	}