diff --git a/src/App/Pages/ScanPage.cs b/src/App/Pages/ScanPage.cs
index d54d022beb..a3cd92fda5 100644
--- a/src/App/Pages/ScanPage.cs
+++ b/src/App/Pages/ScanPage.cs
@@ -68,7 +68,7 @@ namespace Bit.App.Pages
                 Children = { _zxing, _overlay }
             };
 
-            if(Device.RuntimePlatform == Device.iOS)
+            if(Device.RuntimePlatform == Device.iOS || Device.RuntimePlatform == Device.Windows)
             {
                 ToolbarItems.Add(new DismissModalToolBarItem(this, AppResources.Close));
             }
diff --git a/src/UWP/App.xaml.cs b/src/UWP/App.xaml.cs
index 6364de0cba..c97704722d 100644
--- a/src/UWP/App.xaml.cs
+++ b/src/UWP/App.xaml.cs
@@ -35,6 +35,8 @@ namespace Bit.UWP
 
         protected override void OnLaunched(LaunchActivatedEventArgs e)
         {
+            ZXing.Net.Mobile.Forms.WindowsUniversal.ZXingScannerViewRenderer.Init();
+
             var rootFrame = Window.Current.Content as Frame;
             if(rootFrame == null)
             {
diff --git a/src/UWP/UWP.csproj b/src/UWP/UWP.csproj
index 52b6ff2b6e..6f5e99d11c 100644
--- a/src/UWP/UWP.csproj
+++ b/src/UWP/UWP.csproj
@@ -186,6 +186,9 @@
     <PackageReference Include="XLabs.IoC.SimpleInjector">
       <Version>2.0.5782</Version>
     </PackageReference>
+    <PackageReference Include="ZXing.Net.Mobile.Forms">
+      <Version>2.3.2</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\App\App.csproj">