diff --git a/Overlay.c b/Overlay.c
index 9a60017..631147d 100644
--- a/Overlay.c
+++ b/Overlay.c
@@ -187,7 +187,11 @@ OverlayWndProc(HWND hWnd,
 				(ptCur.y != ptStart.y))
 			{
 				RECT rcPrevDmg = POINT2RECT(ptStart, ptPrev);
-				// InvalidateRect(hWnd, &rcCurDmg, TRUE);
+				// Expand out a little bit to contain the focus rect
+				rcPrevDmg.left--;
+				rcPrevDmg.right++;
+				rcPrevDmg.top--;
+				rcPrevDmg.bottom++;
 				InvalidateRect(hWnd, &rcPrevDmg, TRUE);
 			}
 
@@ -211,8 +215,10 @@ OverlayWndProc(HWND hWnd,
 		}
 		break;
 	case WM_KEYUP:
-		// TODO: Escape
-		break;
+		if (wParam != VK_ESCAPE) {
+			break;
+		}
+		/* PASSTHRU */
 	case WM_RBUTTONUP:
 		// We treat right click as Escape
 		PostQuitMessage(1);