diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html
index 91adc9b..d41ba57 100644
--- a/src/app/home/home.page.html
+++ b/src/app/home/home.page.html
@@ -31,7 +31,7 @@
     <app-account-list [ngClass]="layoutOrientationClass" id="accounts-container" [accounts]="accounts$ | async | accountFilter: searchTxt" [type]="accountListType" (accountSelected)="selectAccount($event)"></app-account-list>
   </div>
 
-  <ion-modal [isOpen]="isAddAccountModalOpen" (didDismiss)="onDidDismissModal($event)">
+  <ion-modal [isOpen]="isAddAccountModalOpen" (willDismiss)="onWillDismissModal($event)" (didDismiss)="onDidDismissModal($event)">
     <ng-template>
       <ion-header>
         <ion-toolbar>
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index c42153e..607c4cc 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -160,6 +160,9 @@ export class HomePage implements OnInit {
     this.manualInput = false
     this.isAddAccountModalOpen = false
     this.isScanActive = false
+    if(this.qrscanner) {
+      this.qrscanner.stop()
+    }
     // clear form
     this.validations_form.reset()
     this.draftLogoURL = ''
@@ -167,6 +170,12 @@ export class HomePage implements OnInit {
     this.searchLogoResults = []
   }
 
+  onWillDismissModal(e: Event) {
+    if(this.qrscanner) {
+      this.qrscanner.stop()
+    }
+  }
+
   async closeAddAccountModal() {
     await this.modal.dismiss()
   }