diff --git a/redo/windows/container.c b/redo/windows/container.c
index 4a119ee0..e20d3336 100644
--- a/redo/windows/container.c
+++ b/redo/windows/container.c
@@ -5,11 +5,14 @@
 
 static LRESULT CALLBACK containerWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
-/* TODO
 	RECT r;
 	HDC dc;
 	PAINTSTRUCT ps;
+	LRESULT lResult;
 
+	if (handleParentMessages(hwnd, uMsg, wParam, lParam, &lResult) != FALSE)
+		return lResult;
+/* TODO
 	switch (uMsg) {
 	case WM_PAINT:
 		dc = BeginPaint(hwnd, &ps);
diff --git a/redo/windows/window.c b/redo/windows/window.c
index 3655547b..e619990f 100644
--- a/redo/windows/window.c
+++ b/redo/windows/window.c
@@ -20,6 +20,7 @@ static LRESULT CALLBACK windowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
 	CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam;
 	WINDOWPOS *wp = (WINDOWPOS *) lParam;
 	RECT r;
+	LRESULT lResult;
 
 	w = (struct window *) GetWindowLongPtrW(hwnd, GWLP_USERDATA);
 	if (w == NULL) {
@@ -28,7 +29,8 @@ static LRESULT CALLBACK windowWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA
 		// fall through to DefWindowProc() anyway
 		return DefWindowProcW(hwnd, uMsg, wParam, lParam);
 	}
-	// TODO container stuff
+	if (handleParentMessages(hwnd, uMsg, wParam, lParam, &lResult) != FALSE)
+		return lResult;
 	switch (uMsg) {
 	case WM_COMMAND:
 		// not a menu