diff --git a/Mac/Modules/qd/Qdmodule.c b/Mac/Modules/qd/Qdmodule.c
index 34476d4..aece598 100644
--- a/Mac/Modules/qd/Qdmodule.c
+++ b/Mac/Modules/qd/Qdmodule.c
@@ -144,8 +144,14 @@
 	PyObject *v;
 	GrafPtr *p_itself;
 {
-	if (DlgObj_Check(v) || WinObj_Check(v)) {
-		*p_itself = ((GrafPortObject *)v)->ob_itself;
+	if (DlgObj_Check(v)) {
+		DialogRef dlg = (DialogRef)((GrafPortObject *)v)->ob_itself;
+		*p_itself = (GrafPtr)GetWindowPort(GetDialogWindow(dlg));
+		return 1;
+	}
+	if (WinObj_Check(v)) {
+		WindowRef win = (WindowRef)((GrafPortObject *)v)->ob_itself;
+		*p_itself = (GrafPtr)GetWindowPort(win);
 		return 1;
 	}
 	if (!GrafObj_Check(v))
diff --git a/Mac/Modules/qd/qdsupport.py b/Mac/Modules/qd/qdsupport.py
index f57cf17..fe606f5 100644
--- a/Mac/Modules/qd/qdsupport.py
+++ b/Mac/Modules/qd/qdsupport.py
@@ -219,8 +219,14 @@
 	def outputCheckNewArg(self):
 		Output("if (itself == NULL) return PyMac_Error(resNotFound);")
 	def outputCheckConvertArg(self):
-		OutLbrace("if (DlgObj_Check(v) || WinObj_Check(v))")
-		Output("*p_itself = ((GrafPortObject *)v)->ob_itself;")
+		OutLbrace("if (DlgObj_Check(v))")
+		Output("DialogRef dlg = (DialogRef)((GrafPortObject *)v)->ob_itself;")
+		Output("*p_itself = (GrafPtr)GetWindowPort(GetDialogWindow(dlg));")
+		Output("return 1;")
+		OutRbrace()
+		OutLbrace("if (WinObj_Check(v))")
+		Output("WindowRef win = (WindowRef)((GrafPortObject *)v)->ob_itself;")
+		Output("*p_itself = (GrafPtr)GetWindowPort(win);")
 		Output("return 1;")
 		OutRbrace()
 	def outputGetattrHook(self):