diff --git a/src/popup/accounts/environment.component.html b/src/popup/accounts/environment.component.html
index 00637f7859b..626c5b7b3eb 100644
--- a/src/popup/accounts/environment.component.html
+++ b/src/popup/accounts/environment.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <h2 class="box-header">
         {{ "selfHostedEnvironment" | i18n }}
@@ -100,5 +100,5 @@
         {{ "customEnvironmentFooter" | i18n }}
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/accounts/hint.component.html b/src/popup/accounts/hint.component.html
index f228e7018f3..b4fbfdc05a4 100644
--- a/src/popup/accounts/hint.component.html
+++ b/src/popup/accounts/hint.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <div class="box-content">
         <div class="box-content-row" appBoxRow>
@@ -34,5 +34,5 @@
         {{ "enterEmailToGetHint" | i18n }}
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/accounts/lock.component.html b/src/popup/accounts/lock.component.html
index efc11dcf41e..04e6eb1e102 100644
--- a/src/popup/accounts/lock.component.html
+++ b/src/popup/accounts/lock.component.html
@@ -8,7 +8,7 @@
       <button type="submit" appBlurClick *ngIf="!hideInput">{{ "unlock" | i18n }}</button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <div class="box-content">
         <div class="box-content-row box-content-row-flex" appBoxRow *ngIf="!hideInput">
@@ -81,5 +81,5 @@
     <p class="text-center text-muted" *ngIf="pendingBiometric">
       <i class="bwi bwi-spinner bwi-spin" aria-hidden="true"></i> {{ "awaitDesktop" | i18n }}
     </p>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/accounts/login.component.html b/src/popup/accounts/login.component.html
index df5c1e836af..d82d214fb2e 100644
--- a/src/popup/accounts/login.component.html
+++ b/src/popup/accounts/login.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <div class="box-content">
         <div class="box-content-row" appBoxRow>
@@ -68,5 +68,5 @@
       <a routerLink="/hint">{{ "getMasterPasswordHint" | i18n }}</a>
     </p>
     <app-private-mode-warning></app-private-mode-warning>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/accounts/register.component.html b/src/popup/accounts/register.component.html
index 99f6137c517..fc9c4e7990d 100644
--- a/src/popup/accounts/register.component.html
+++ b/src/popup/accounts/register.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <div class="box-content">
         <div class="box-content-row" appBoxRow>
@@ -156,5 +156,5 @@
         </div>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/accounts/remove-password.component.html b/src/popup/accounts/remove-password.component.html
index dee21d74caf..793bcff3e09 100644
--- a/src/popup/accounts/remove-password.component.html
+++ b/src/popup/accounts/remove-password.component.html
@@ -6,7 +6,7 @@
   <div class="right"></div>
 </header>
 
-<content>
+<main tabindex="-1">
   <div class="box">
     <div class="box-content">
       <div class="box-content-row" appBoxRow>
@@ -46,4 +46,4 @@
       </div>
     </div>
   </div>
-</content>
+</main>
diff --git a/src/popup/accounts/set-password.component.html b/src/popup/accounts/set-password.component.html
index 621921e5dad..b8e89b7693d 100644
--- a/src/popup/accounts/set-password.component.html
+++ b/src/popup/accounts/set-password.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="full-loading-spinner" *ngIf="syncLoading">
       <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
     </div>
@@ -144,5 +144,5 @@
         </div>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/accounts/two-factor-options.component.html b/src/popup/accounts/two-factor-options.component.html
index 139be18ac8b..e70d6a373cd 100644
--- a/src/popup/accounts/two-factor-options.component.html
+++ b/src/popup/accounts/two-factor-options.component.html
@@ -7,7 +7,7 @@
   </h1>
   <div class="right"></div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="box">
     <div class="box-content">
       <button
@@ -26,4 +26,4 @@
       </button>
     </div>
   </div>
-</content>
+</main>
diff --git a/src/popup/accounts/two-factor.component.html b/src/popup/accounts/two-factor.component.html
index e94f94751d0..84ad0cc8bb6 100644
--- a/src/popup/accounts/two-factor.component.html
+++ b/src/popup/accounts/two-factor.component.html
@@ -23,7 +23,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <ng-container
       *ngIf="
         selectedProviderType === providerType.Authenticator ||
@@ -140,5 +140,5 @@
         </button>
       </p>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/accounts/update-temp-password.component.html b/src/popup/accounts/update-temp-password.component.html
index 40d133df8dd..f1836132f71 100644
--- a/src/popup/accounts/update-temp-password.component.html
+++ b/src/popup/accounts/update-temp-password.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <app-callout type="warning" title="{{ 'updateMasterPassword' | i18n }}">
       {{ "updateMasterPasswordWarning" | i18n }}
     </app-callout>
@@ -126,5 +126,5 @@
         {{ "masterPassHintDesc" | i18n }}
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/app.component.ts b/src/popup/app.component.ts
index 19ee5bf0bd3..62872f35b76 100644
--- a/src/popup/app.component.ts
+++ b/src/popup/app.component.ts
@@ -19,9 +19,9 @@ import { routerTransition } from "./app-routing.animations";
   selector: "app-root",
   styles: [],
   animations: [routerTransition],
-  template: ` <main [@routerTransition]="getState(o)">
+  template: ` <div [@routerTransition]="getState(o)">
     <router-outlet #o="outlet"></router-outlet>
-  </main>`,
+  </div>`,
 })
 export class AppComponent implements OnInit {
   private lastActivity: number = null;
diff --git a/src/popup/generator/generator.component.html b/src/popup/generator/generator.component.html
index f67039fea6a..02650910a2d 100644
--- a/src/popup/generator/generator.component.html
+++ b/src/popup/generator/generator.component.html
@@ -14,7 +14,7 @@
     </button>
   </div>
 </header>
-<content>
+<main tabindex="-1">
   <app-callout type="info" *ngIf="enforcedPasswordPolicyOptions?.inEffect() && type === 'password'">
     {{ "passwordGeneratorPolicyInEffect" | i18n }}
   </app-callout>
@@ -453,4 +453,4 @@
       </div>
     </div>
   </ng-container>
-</content>
+</main>
diff --git a/src/popup/generator/password-generator-history.component.html b/src/popup/generator/password-generator-history.component.html
index e24d7d2053f..62e5abd28e0 100644
--- a/src/popup/generator/password-generator-history.component.html
+++ b/src/popup/generator/password-generator-history.component.html
@@ -14,7 +14,7 @@
     </button>
   </div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="box list full-list" *ngIf="history && history.length">
     <div class="box-content">
       <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
@@ -45,4 +45,4 @@
   <div class="no-items" *ngIf="!history || !history.length">
     <p>{{ "noPasswordsInList" | i18n }}</p>
   </div>
-</content>
+</main>
diff --git a/src/popup/scss/base.scss b/src/popup/scss/base.scss
index c19cb129a28..c3a5edafded 100644
--- a/src/popup/scss/base.scss
+++ b/src/popup/scss/base.scss
@@ -107,17 +107,17 @@ textarea {
   resize: vertical;
 }
 
-main {
+app-root > div {
   height: 100%;
 }
 
-content::-webkit-scrollbar,
+main::-webkit-scrollbar,
 cdk-virtual-scroll-viewport::-webkit-scrollbar {
   width: 10px;
   height: 10px;
 }
 
-content::-webkit-scrollbar-track {
+main::-webkit-scrollbar-track {
   background-color: transparent;
 }
 
@@ -127,7 +127,7 @@ cdk-virtual-scroll-viewport::-webkit-scrollbar-track {
   }
 }
 
-content::-webkit-scrollbar-thumb,
+main::-webkit-scrollbar-thumb,
 cdk-virtual-scroll-viewport::-webkit-scrollbar-thumb {
   border-radius: 10px;
   margin-right: 1px;
@@ -373,7 +373,7 @@ app-root {
     padding: 0 calc((100% - 500px) / 2);
   }
 
-  app-login content {
+  app-login main {
     padding: 0 calc((100% - 500px) / 2);
   }
 
@@ -381,7 +381,7 @@ app-root {
     padding: 0 calc((100% - 500px) / 2);
   }
 
-  app-two-factor content {
+  app-two-factor main {
     padding: 0 calc((100% - 500px) / 2);
   }
 
@@ -389,12 +389,12 @@ app-root {
     padding: 0 calc((100% - 500px) / 2);
   }
 
-  app-lock content {
+  app-lock main {
     padding: 0 calc((100% - 500px) / 2);
   }
 }
 
-content {
+main {
   position: absolute;
   top: 44px;
   bottom: 0;
@@ -423,7 +423,7 @@ content {
 }
 
 .tab-page {
-  content {
+  main {
     bottom: 55px;
   }
 }
diff --git a/src/popup/scss/pages.scss b/src/popup/scss/pages.scss
index f3efea4c304..9e0dd81a53b 100644
--- a/src/popup/scss/pages.scss
+++ b/src/popup/scss/pages.scss
@@ -1,7 +1,7 @@
 @import "variables.scss";
 
 app-sync {
-  content {
+  main {
     .btn {
       margin-bottom: 10px;
     }
diff --git a/src/popup/send/send-add-edit.component.html b/src/popup/send/send-add-edit.component.html
index 3754ed18b94..3fea4094d6e 100644
--- a/src/popup/send/send-add-edit.component.html
+++ b/src/popup/send/send-add-edit.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content *ngIf="send">
+  <main tabindex="-1" *ngIf="send">
     <!-- Policy Banner -->
     <app-callout type="warning" title="{{ 'sendDisabled' | i18n }}" *ngIf="disableSend">
       {{ "sendDisabledWarning" | i18n }}
@@ -315,5 +315,5 @@
         </button>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/send/send-groupings.component.html b/src/popup/send/send-groupings.component.html
index 33d9fa1fbda..72c79e7cb77 100644
--- a/src/popup/send/send-groupings.component.html
+++ b/src/popup/send/send-groupings.component.html
@@ -27,7 +27,7 @@
     </button>
   </div>
 </header>
-<content [ngClass]="{ flex: disableSend, 'tab-page': disableSend }">
+<main tabindex="-1" [ngClass]="{ flex: disableSend, 'tab-page': disableSend }">
   <app-callout type="warning" title="{{ 'sendDisabled' | i18n }}" *ngIf="disableSend">
     {{ "sendDisabledWarning" | i18n }}
   </app-callout>
@@ -119,4 +119,4 @@
       </div>
     </div>
   </ng-container>
-</content>
+</main>
diff --git a/src/popup/send/send-type.component.html b/src/popup/send/send-type.component.html
index 7fc3932e466..1e14dc151bf 100644
--- a/src/popup/send/send-type.component.html
+++ b/src/popup/send/send-type.component.html
@@ -30,7 +30,7 @@
     </button>
   </div>
 </header>
-<content [ngClass]="{ flex: disableSend }">
+<main tabindex="-1" [ngClass]="{ flex: disableSend }">
   <app-callout type="warning" title="{{ 'sendDisabled' | i18n }}" *ngIf="disableSend">
     {{ "sendDisabledWarning" | i18n }}
   </app-callout>
@@ -66,4 +66,4 @@
       </app-send-list>
     </div>
   </div>
-</content>
+</main>
diff --git a/src/popup/settings/excluded-domains.component.html b/src/popup/settings/excluded-domains.component.html
index 4a488a81cb5..8353be2e853 100644
--- a/src/popup/settings/excluded-domains.component.html
+++ b/src/popup/settings/excluded-domains.component.html
@@ -13,7 +13,7 @@
       <button type="submit" appBlurClick>{{ "save" | i18n }}</button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <div class="box-content">
         <ng-container *ngIf="excludedDomains">
@@ -84,5 +84,5 @@
         {{ "excludedDomainsDesc" | i18n }}
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/settings/export.component.html b/src/popup/settings/export.component.html
index cdd7510c576..ee74c4f7d92 100644
--- a/src/popup/settings/export.component.html
+++ b/src/popup/settings/export.component.html
@@ -15,7 +15,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <app-callout type="warning" title="{{ 'vaultExportDisabled' | i18n }}" *ngIf="disabledByPolicy">
       {{ "personalVaultExportPolicyInEffect" | i18n }}
     </app-callout>
@@ -36,5 +36,5 @@
         <p>{{ "confirmIdentity" | i18n }}</p>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/settings/folder-add-edit.component.html b/src/popup/settings/folder-add-edit.component.html
index 41392440030..3999f6fb88d 100644
--- a/src/popup/settings/folder-add-edit.component.html
+++ b/src/popup/settings/folder-add-edit.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content *ngIf="folder">
+  <main tabindex="-1" *ngIf="folder">
     <div class="box">
       <div class="box-content">
         <div class="box-content-row" appBoxRow>
@@ -49,5 +49,5 @@
         </button>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/settings/folders.component.html b/src/popup/settings/folders.component.html
index e9c1394b9e6..47b6f78a1d1 100644
--- a/src/popup/settings/folders.component.html
+++ b/src/popup/settings/folders.component.html
@@ -19,7 +19,7 @@
     </button>
   </div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="box list full-list" *ngIf="folders && folders.length">
     <div class="box-content">
       <button
@@ -36,4 +36,4 @@
   <div class="no-items" *ngIf="!folders || !folders.length">
     <p>{{ "noFolders" | i18n }}</p>
   </div>
-</content>
+</main>
diff --git a/src/popup/settings/options.component.html b/src/popup/settings/options.component.html
index ccdc397785c..4281c97e527 100644
--- a/src/popup/settings/options.component.html
+++ b/src/popup/settings/options.component.html
@@ -10,7 +10,7 @@
   </h1>
   <div class="right"></div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="box">
     <h2>
       <button
@@ -255,4 +255,4 @@
       <div class="box-footer">{{ "defaultAutoFillOnPageLoadDesc" | i18n }}</div>
     </div>
   </ng-container>
-</content>
+</main>
diff --git a/src/popup/settings/premium.component.html b/src/popup/settings/premium.component.html
index 915f63f7fb5..a12fd370d28 100644
--- a/src/popup/settings/premium.component.html
+++ b/src/popup/settings/premium.component.html
@@ -10,7 +10,7 @@
   </h1>
   <div class="right"></div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="content">
     <ng-container *ngIf="!isPremium">
       <p class="text-center lead">{{ "premiumNotCurrentMember" | i18n }}</p>
@@ -70,4 +70,4 @@
       </button>
     </ng-container>
   </div>
-</content>
+</main>
diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html
index 5b3aefdea87..3f441835c54 100644
--- a/src/popup/settings/settings.component.html
+++ b/src/popup/settings/settings.component.html
@@ -7,7 +7,7 @@
   </h1>
   <div class="right"></div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="box list">
     <h2 class="box-header">{{ "manage" | i18n }}</h2>
     <div class="box-content single-line">
@@ -223,4 +223,4 @@
     </div>
     <div class="box-footer">{{ "rateExtensionDesc" | i18n }}</div>
   </div>
-</content>
+</main>
diff --git a/src/popup/settings/sync.component.html b/src/popup/settings/sync.component.html
index 7e989decd89..74f1c0ea872 100644
--- a/src/popup/settings/sync.component.html
+++ b/src/popup/settings/sync.component.html
@@ -10,7 +10,7 @@
   </h1>
   <div class="right"></div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="content center-content">
     <button
       type="button"
@@ -25,4 +25,4 @@
     </button>
     <p class="text-center text-muted small">{{ "lastSync" | i18n }} {{ lastSync }}</p>
   </div>
-</content>
+</main>
diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html
index 982d839b241..c856083f4d3 100644
--- a/src/popup/vault/add-edit.component.html
+++ b/src/popup/vault/add-edit.component.html
@@ -13,7 +13,7 @@
       </button>
     </div>
   </header>
-  <content *ngIf="cipher">
+  <main tabindex="-1" *ngIf="cipher">
     <app-callout type="info" *ngIf="allowOwnershipOptions() && !allowPersonal">
       {{ "personalOwnershipPolicyInEffect" | i18n }}
     </app-callout>
@@ -656,5 +656,5 @@
         </button>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/vault/attachments.component.html b/src/popup/vault/attachments.component.html
index a662e407ed1..4b687dc10b5 100644
--- a/src/popup/vault/attachments.component.html
+++ b/src/popup/vault/attachments.component.html
@@ -19,7 +19,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box" *ngIf="cipher && cipher.hasAttachments">
       <div class="box-content no-hover">
         <div class="box-content-row box-content-row-flex" *ngFor="let a of cipher.attachments">
@@ -69,5 +69,5 @@
         {{ "maxFileSize" | i18n }}
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/vault/ciphers.component.html b/src/popup/vault/ciphers.component.html
index 1608c8f0289..729a368c54a 100644
--- a/src/popup/vault/ciphers.component.html
+++ b/src/popup/vault/ciphers.component.html
@@ -24,7 +24,7 @@
     </button>
   </div>
 </header>
-<content [ngClass]="{ 'stacked-boxes': showGroupings() }">
+<main tabindex="-1" [ngClass]="{ 'stacked-boxes': showGroupings() }">
   <ng-container *ngIf="showGroupings()">
     <div class="box list" *ngIf="nestedFolders && nestedFolders.length">
       <h2 class="box-header">
@@ -108,4 +108,4 @@
       </div>
     </cdk-virtual-scroll-viewport>
   </ng-container>
-</content>
+</main>
diff --git a/src/popup/vault/collections.component.html b/src/popup/vault/collections.component.html
index 6514c38230a..35d7b082610 100644
--- a/src/popup/vault/collections.component.html
+++ b/src/popup/vault/collections.component.html
@@ -16,7 +16,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <div class="box-content" *ngIf="!collections || !collections.length">
         <div class="box-content-row padded no-hover">
@@ -39,5 +39,5 @@
         </div>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/vault/current-tab.component.html b/src/popup/vault/current-tab.component.html
index b4f9b9e05cf..f0d2277b22c 100644
--- a/src/popup/vault/current-tab.component.html
+++ b/src/popup/vault/current-tab.component.html
@@ -30,7 +30,7 @@
     </button>
   </div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="no-items" *ngIf="!loaded">
     <i class="bwi bwi-spinner bwi-spin bwi-3x" aria-hidden="true"></i>
   </div>
@@ -91,4 +91,4 @@
       </div>
     </div>
   </ng-container>
-</content>
+</main>
diff --git a/src/popup/vault/groupings.component.html b/src/popup/vault/groupings.component.html
index afaa79b551e..bd352e4a608 100644
--- a/src/popup/vault/groupings.component.html
+++ b/src/popup/vault/groupings.component.html
@@ -22,7 +22,7 @@
     </button>
   </div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="no-items" *ngIf="(!ciphers || !ciphers.length) && !showSearching()">
     <i class="bwi bwi-spinner bwi-spin bwi-3x" *ngIf="!loaded"></i>
     <ng-container *ngIf="loaded">
@@ -227,4 +227,4 @@
       </div>
     </cdk-virtual-scroll-viewport>
   </ng-container>
-</content>
+</main>
diff --git a/src/popup/vault/password-history.component.html b/src/popup/vault/password-history.component.html
index 350cc1e6b2a..009b7089baa 100644
--- a/src/popup/vault/password-history.component.html
+++ b/src/popup/vault/password-history.component.html
@@ -7,7 +7,7 @@
   </h1>
   <div class="right"></div>
 </header>
-<content>
+<main tabindex="-1">
   <div class="box list full-list" *ngIf="history && history.length">
     <div class="box-content">
       <div class="box-content-row box-content-row-flex" *ngFor="let h of history">
@@ -36,4 +36,4 @@
   <div class="no-items" *ngIf="!history || !history.length">
     <p>{{ "noPasswordsInList" | i18n }}</p>
   </div>
-</content>
+</main>
diff --git a/src/popup/vault/share.component.html b/src/popup/vault/share.component.html
index 40974631de1..7e6d6e38af3 100644
--- a/src/popup/vault/share.component.html
+++ b/src/popup/vault/share.component.html
@@ -18,7 +18,7 @@
       </button>
     </div>
   </header>
-  <content>
+  <main tabindex="-1">
     <div class="box">
       <div class="box-content" *ngIf="!organizations || !organizations.length">
         <div class="box-content-row padded no-hover">
@@ -67,5 +67,5 @@
         </div>
       </div>
     </div>
-  </content>
+  </main>
 </form>
diff --git a/src/popup/vault/view.component.html b/src/popup/vault/view.component.html
index 2a012963911..1b72f478915 100644
--- a/src/popup/vault/view.component.html
+++ b/src/popup/vault/view.component.html
@@ -11,7 +11,7 @@
     </button>
   </div>
 </header>
-<content *ngIf="cipher">
+<main tabindex="-1" *ngIf="cipher">
   <div class="box">
     <h2 class="box-header">
       {{ "itemInformation" | i18n }}
@@ -521,4 +521,4 @@
       </div>
     </div>
   </div>
-</content>
+</main>