diff --git a/WireGuard/Coordinators/AppCoordinator.swift b/WireGuard/Coordinators/AppCoordinator.swift
index 437a30b..1ae11a5 100644
--- a/WireGuard/Coordinators/AppCoordinator.swift
+++ b/WireGuard/Coordinators/AppCoordinator.swift
@@ -521,7 +521,8 @@ extension AppCoordinator: TunnelConfigurationTableViewControllerDelegate {
 
 extension AppCoordinator: QRScanViewControllerDelegate {
     func didSave(tunnel: Tunnel, qrScanViewController: QRScanViewController) {
-        showTunnelConfigurationViewController(tunnel: tunnel, context: tunnel.managedObjectContext!)
+        qrScanViewController.navigationController?.popViewController(animated: true)
+        showTunnelInfoViewController(tunnel: tunnel, context: tunnel.managedObjectContext!)
     }
 }
 
diff --git a/WireGuard/ViewControllers/QRScanViewController.swift b/WireGuard/ViewControllers/QRScanViewController.swift
index ad57f77..811602e 100644
--- a/WireGuard/ViewControllers/QRScanViewController.swift
+++ b/WireGuard/ViewControllers/QRScanViewController.swift
@@ -95,13 +95,14 @@ class QRScanViewController: UIViewController {
                 }
             }
         }
-        
+
         previewLayer.frame = self.view.bounds
     }
 
     func scanDidComplete(withCode code: String) {
         do {
             let tunnel = try Tunnel.fromConfig(code, context: viewContext)
+            try viewContext.save()
             delegate?.didSave(tunnel: tunnel, qrScanViewController: self)
         } catch {
             scanDidEncounterError(title: "Invalid Code", message: "The scanned code is not a valid WireGuard config file.")