diff --git a/support/hololens/ServoApp/App.cpp b/support/hololens/ServoApp/App.cpp
index 3bb1e776fb8..8d80c800f4e 100644
--- a/support/hololens/ServoApp/App.cpp
+++ b/support/hololens/ServoApp/App.cpp
@@ -82,7 +82,7 @@ void App::OnActivated(IActivatedEventArgs const &args) {
     }
     auto page = rootFrame.Content().try_as<BrowserPage>();
     page->LoadServoURI(protocolActivatedEventArgs.Uri());
-    // If Servo was opened as a result of clicking on a servo:// URL,
+    // If Servo was opened as a result of clicking on a fxr:// URL,
     // we activate transient mode.
     page->SetTransientMode(!isRunning);
   }
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.cpp b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
index f856aaad679..dc721410b89 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.cpp
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.cpp
@@ -36,7 +36,7 @@ void ServoControl::Shutdown() {
 
 void ServoControl::OnLoaded(IInspectable const &, RoutedEventArgs const &) {
   auto panel = Panel();
-  panel.PointerReleased(
+  panel.Tapped(
       std::bind(&ServoControl::OnSurfaceClicked, this, _1, _2));
   panel.ManipulationStarted(
       [=](IInspectable const &,
@@ -95,10 +95,10 @@ void ServoControl::OnSurfaceManipulationDelta(
 }
 
 void ServoControl::OnSurfaceClicked(IInspectable const &,
-                                    Input::PointerRoutedEventArgs const &e) {
-  auto coords = e.GetCurrentPoint(Panel());
-  auto x = coords.Position().X * mDPI;
-  auto y = coords.Position().Y * mDPI;
+                                    Input::TappedRoutedEventArgs const &e) {
+  auto coords = e.GetPosition(Panel());
+  auto x = coords.X * mDPI;
+  auto y = coords.Y * mDPI;
   RunOnGLThread([=] { mServo->Click(x, y); });
   e.Handled(true);
 }
diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h
index e13e3b0c69b..1476b4ba7b5 100644
--- a/support/hololens/ServoApp/ServoControl/ServoControl.h
+++ b/support/hololens/ServoApp/ServoControl/ServoControl.h
@@ -118,7 +118,7 @@ private:
 
   void
   OnSurfaceClicked(IInspectable const &,
-                   Windows::UI::Xaml::Input::PointerRoutedEventArgs const &);
+                   Windows::UI::Xaml::Input::TappedRoutedEventArgs const &);
 
   void OnSurfaceManipulationDelta(
       IInspectable const &,
diff --git a/support/hololens/ServoApp/Themes/Generic.xaml b/support/hololens/ServoApp/Themes/Generic.xaml
index c4969c9fd11..28ce3c93c9d 100644
--- a/support/hololens/ServoApp/Themes/Generic.xaml
+++ b/support/hololens/ServoApp/Themes/Generic.xaml
@@ -9,7 +9,7 @@
       <Setter.Value>
         <ControlTemplate TargetType="local:ServoControl">
           <Grid>
-            <SwapChainPanel x:Name="swapChainPanel" MinHeight="200" MinWidth="200" ManipulationMode="All">
+            <SwapChainPanel x:Name="swapChainPanel" MinHeight="200" MinWidth="200" ManipulationMode="All" IsTapEnabled="True">
             </SwapChainPanel>
           </Grid>
         </ControlTemplate>