diff --git a/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java b/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
index e0a4c76b0..d7ef9d632 100644
--- a/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
+++ b/samples/ApiDemos/src/com/example/android/apis/appwidget/ExampleAppWidgetConfigure.java
@@ -89,7 +89,10 @@ public class ExampleAppWidgetConfigure extends Activity {
             saveTitlePref(ExampleAppWidgetConfigure.this, mAppWidgetId,
                     mAppWidgetPrefix.getText().toString());
 
-            setResult(RESULT_OK);
+            // Make sure we pass back the original appWidgetId
+            Intent resultValue = new Intent();
+            resultValue.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, mAppWidgetId);
+            setResult(RESULT_OK, resultValue);
             finish();
         }
     };