diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index a93c8a3..380511f 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -702,6 +702,8 @@
     : INHERITED(hwnd)
     , fDevManager(NULL) {
 
+    fCurrIndex = -1;
+
     this->registerPictFileSamples(argv, argc);
     this->registerPictFileSample(argv, argc);
     SkGMRegistyToSampleRegistry();
@@ -714,7 +716,6 @@
     }
 
     const char* resourcePath = NULL;
-    fCurrIndex = -1;
     fMSAASampleCount = 0;
 
     const char* const commandName = argv[0];
@@ -940,6 +941,7 @@
     }
     if (pict) {
         SkString path(pict);
+        fCurrIndex = fSamples.count();
         *fSamples.append() = new PictFileFactory(path);
     }
 }