diff --git a/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.html b/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.html
index 6b6dd4f..6561161 100644
--- a/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.html
+++ b/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.html
@@ -4,7 +4,7 @@
 <GridLayout rows="100, *" columns="*, *" [formGroup]="movieForm" class="yellow-grid">
     <Label row="0" col="0" text="Pick a movie:" class="black-label label-center field-name-label"></Label>
     <PickerField #picker row="0" col="1" formControlName="movie" hint="select a movie" padding="10" pickerTitle="Pick a movie"
-        class="picker-field" modalClass="myModal" valueField="year" textField="name" [items]="pickerItems">
+        class="picker-field" modalClass="myModal" valueField="id" textField="name" [items]="pickerItems">
         <ng-template let-item="item">
             <GridLayout rows="auto, *" columns="*, auto" class="yellow-grid">
                 <Label [text]="item.name" colSpan="2" class="black-label item-template-top-label"></Label>
diff --git a/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.ts b/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.ts
index 2678c22..27df38a 100644
--- a/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.ts
+++ b/demo-angular/src/app/examples/reactive-forms/reactive-forms-example.component.ts
@@ -28,7 +28,7 @@ export class ReactiveFormsExampleComponent implements OnInit {
         ]);
 
         this.movieForm = new FormGroup({
-            movie: new FormControl(this.pickerItems.getItem(0).year, Validators.required),
+            movie: new FormControl(this.pickerItems.getItem(0).id, Validators.required),
         });
     }
 
diff --git a/src/picker.common.ts b/src/picker.common.ts
index 49eb40b..72603d1 100644
--- a/src/picker.common.ts
+++ b/src/picker.common.ts
@@ -156,13 +156,6 @@ export class PickerField extends TextField implements TemplatedItemsView {
 
         const context = this;
         const callback = (sender: View, selectedIndex: number) => {
-            if (selectedIndex !== undefined) {
-                let object = this.getDataItem(selectedIndex);
-                this.selectedIndex = selectedIndex;
-
-                this._updateSelectedValue(object);
-            }
-
             this.disposeModalView();
         };
         this._modalRoot.navigate(() => this._page);
@@ -170,6 +163,13 @@ export class PickerField extends TextField implements TemplatedItemsView {
     }
 
     private listViewItemTapHandler(args: ItemEventData) {
+        if (args.index !== undefined) {
+            let object = this.getDataItem(args.index);
+            this.selectedIndex = args.index;
+
+            this._updateSelectedValue(object);
+        }
+
         this.closeCallback(args.view, args.index);
     }