1 files changed, 5 insertions, 2 deletions
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs
index 5f1a0ef3..04bcdf8c 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Bugzilla42074.cs
@@ -44,12 +44,15 @@ namespace Xamarin.Forms.Controls.Issues
         public void TimePickerCancelShouldUnfocus()
         {
             RunningApp.Tap(q => q.Marked(TimePicker));
+            RunningApp.WaitForElement(q => q.Marked("Cancel"));
 
-			RunningApp.Back();
+            RunningApp.Tap(q => q.Marked("Cancel"));
             RunningApp.WaitForElement(q => q.Marked("Click to focus TimePicker"));
 
             RunningApp.Tap(q => q.Marked("Click to focus TimePicker"));
-			RunningApp.Back();
+            RunningApp.WaitForElement(q => q.Marked("Cancel"));
+
+            RunningApp.Tap(q => q.Marked("Cancel"));
         }
 #endif