diff --git a/src/popup/app/settings/views/settings.html b/src/popup/app/settings/views/settings.html
index 6abb656fd11..4071ddce9fc 100644
--- a/src/popup/app/settings/views/settings.html
+++ b/src/popup/app/settings/views/settings.html
@@ -1,7 +1,5 @@
 <div class="header">
-    <div class="left">
-        <pop-out></pop-out>
-    </div>
+    <pop-out class="left"></pop-out>
     <div class="title">{{i18n.settings}}</div>
 </div>
 <div class="content content-tabs">
diff --git a/src/popup/app/tools/tools.component.html b/src/popup/app/tools/tools.component.html
index f2f57be98b4..05a412aecda 100644
--- a/src/popup/app/tools/tools.component.html
+++ b/src/popup/app/tools/tools.component.html
@@ -1,7 +1,5 @@
 <div class="header">
-    <div class="left">
-        <pop-out></pop-out>
-    </div>
+    <pop-out class="left"></pop-out>
     <div class="title">{{$ctrl.i18n.tools}}</div>
 </div>
 <div class="content content-tabs">
diff --git a/src/popup/app/vault/views/vault.html b/src/popup/app/vault/views/vault.html
index f7cdcca8439..4e701dc6fab 100644
--- a/src/popup/app/vault/views/vault.html
+++ b/src/popup/app/vault/views/vault.html
@@ -1,7 +1,5 @@
 <div class="header header-search">
-    <div class="left">
-        <pop-out></pop-out>
-    </div>
+    <pop-out class="left"></pop-out>
     <div class="search" ng-style="{'visibility': disableSearch ? 'hidden' : 'visible'}">
         <input type="search" placeholder="{{::i18n.searchVault}}" id="search" ng-model="searchText" />
         <i class="fa fa-search"></i>
diff --git a/src/services/utils.service.ts b/src/services/utils.service.ts
index 62b54901876..03f09376a79 100644
--- a/src/services/utils.service.ts
+++ b/src/services/utils.service.ts
@@ -300,7 +300,7 @@ export default class UtilsService implements UtilsServiceInterface {
         }
 
         const sectionItems = doc.querySelectorAll('.list-section-item');
-        for (const item of sectionItems) {
+        sectionItems.forEach((item) => {
             item.addEventListener('click', (e) => {
                 if (e.defaultPrevented) {
                     return;
@@ -340,11 +340,11 @@ export default class UtilsService implements UtilsServiceInterface {
                     }
                 }
             }, false);
-        }
+        });
 
         const sectionFormItems = doc.querySelectorAll(
             '.list-section-item input, .list-section-item select, .list-section-item textarea');
-        for (const item of sectionFormItems) {
+        sectionFormItems.forEach((item) => {
             item.addEventListener('focus', (e: Event) => {
                 const el = e.target as HTMLElement;
                 const cell = el.closest('.list-section-item');
@@ -364,7 +364,7 @@ export default class UtilsService implements UtilsServiceInterface {
 
                 cell.classList.remove('active');
             }, false);
-        }
+        });
     }
 
     getDomain(uriString: string): string {