diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 3ab9e89..1d50b5c 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -224,8 +224,6 @@
     }
 
     virtual void tearDownBackend(SampleWindow *win) {
-        win->detach();
-        fBackend = kNone_BackEndType;
 
         SkSafeUnref(fCurContext);
         fCurContext = NULL;
@@ -235,6 +233,9 @@
 
         SkSafeUnref(fCurRenderTarget);
         fCurRenderTarget = NULL;
+
+        win->detach();
+        fBackend = kNone_BackEndType;
     }
 
     virtual bool prepareCanvas(SampleWindow::DeviceType dType,