1 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
index a1257fdb0f..ada4d15082 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
+++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Canvas.java
@@ -610,8 +610,11 @@ void viewWillMoveToWindow(int /*long*/ id, int /*long*/ sel, int /*long*/ arg0)
 	super.viewWillMoveToWindow(id, sel, arg0);
 	if (glcontext != null) {
 		new NSWindow(arg0).setOpaque(false);
-		NSWindow window = view.window();
-		window.setOpaque(getShell().region == null);
+		Shell shell = getShell();
+		NSWindow window = shell.window;
+		if (window != null) {
+			window.setOpaque(shell.region == null);
+		}
 	}
 }