diff --git a/ShareExtension/Base.lproj/ShareViewController.xib b/ShareExtension/Base.lproj/ShareViewController.xib
index 189190b..6856a98 100644
--- a/ShareExtension/Base.lproj/ShareViewController.xib
+++ b/ShareExtension/Base.lproj/ShareViewController.xib
@@ -109,7 +109,7 @@ Gw
                     </connections>
                 </button>
                 <customView id="ACO-U2-AZj">
-                    <rect key="frame" x="0.0" y="51" width="404" height="146"/>
+                    <rect key="frame" x="0.0" y="48" width="404" height="146"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </customView>
             </subviews>
diff --git a/ShareExtension/ShareViewController.swift b/ShareExtension/ShareViewController.swift
index 3a4225f..95afc17 100644
--- a/ShareExtension/ShareViewController.swift
+++ b/ShareExtension/ShareViewController.swift
@@ -111,6 +111,9 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
 	}
 	
 	override func viewWillDisappear() {
+        
+        self.qrWindow?.close()
+        
 		if chosenDevice==nil{
 			NearbyConnectionManager.shared.stopDeviceDiscovery()
 		}
@@ -118,7 +121,10 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
 	}
 
 	@IBAction func cancel(_ sender: AnyObject?) {
-		if let device=chosenDevice{
+		
+        self.qrWindow?.close()
+        
+        if let device=chosenDevice{
 			NearbyConnectionManager.shared.cancelOutgoingTransfer(id: device.id!)
 		}
 		let cancelError = NSError(domain: NSCocoaErrorDomain, code: NSUserCancelledError, userInfo: nil)
@@ -141,10 +147,6 @@ class ShareViewController: NSViewController, ShareExtensionDelegate{
             defer: false
         )
         
-        qrWindow?.styleMask.insert(.fullSizeContentView)
-        qrWindow?.titleVisibility = .hidden
-        qrWindow?.titlebarAppearsTransparent = true
-        
         qrWindow?.center()
         qrWindow?.isReleasedWhenClosed = false
         qrWindow?.setFrameAutosaveName("QrCodeScreen")