diff --git a/GitTrends.UITests/Pages/RepositoryPage.cs b/GitTrends.UITests/Pages/RepositoryPage.cs
index a716f0b86..88a66fcd7 100644
--- a/GitTrends.UITests/Pages/RepositoryPage.cs
+++ b/GitTrends.UITests/Pages/RepositoryPage.cs
@@ -4,6 +4,7 @@
 using GitTrends.Shared;
 using Newtonsoft.Json;
 using Xamarin.UITest;
+using Xamarin.UITest.Android;
 using Query = System.Func<Xamarin.UITest.Queries.AppQuery, Xamarin.UITest.Queries.AppQuery>;
 
 namespace GitTrends.UITests
@@ -64,7 +65,7 @@ public void EnterSearchBarText(string text)
 
         public void TapSettingsButton()
         {
-            if (App.Query(_androidContextMenuOverflowButton).Any())
+            if (App is AndroidApp)
             {
                 App.Tap(_androidContextMenuOverflowButton);
                 App.Screenshot("Android Overflow Button Tapped");
diff --git a/GitTrends.UITests/Pages/TrendsPage.cs b/GitTrends.UITests/Pages/TrendsPage.cs
index 147af2163..6bf6c3894 100644
--- a/GitTrends.UITests/Pages/TrendsPage.cs
+++ b/GitTrends.UITests/Pages/TrendsPage.cs
@@ -4,6 +4,7 @@
 using GitTrends.Mobile.Shared;
 using Newtonsoft.Json;
 using Xamarin.UITest;
+using Xamarin.UITest.Android;
 using Query = System.Func<Xamarin.UITest.Queries.AppQuery, Xamarin.UITest.Queries.AppQuery>;
 
 namespace GitTrends.UITests
@@ -81,7 +82,7 @@ public override Task WaitForPageToLoad(TimeSpan? timespan = null)
 
         public void TapReferringSitesButton()
         {
-            if (App.Query(_androidContextMenuOverflowButton).Any())
+            if (App is AndroidApp)
             {
                 App.Tap(_androidContextMenuOverflowButton);
                 App.Screenshot("Android Overflow Button Tapped");