diff --git a/app/components/layout/account_menu_component.html.erb b/app/components/layout/account_menu_component.html.erb
new file mode 100644
index 000000000..240ce2842
--- /dev/null
+++ b/app/components/layout/account_menu_component.html.erb
@@ -0,0 +1,5 @@
+<ul class="menu" data-responsive-menu="medium-dropdown">
+  <%= render "shared/admin_login_items", current_user: user %>
+  <%= render Layout::NotificationItemComponent.new(user) %>
+  <%= render "devise/menu/login_items", current_user: user %>
+</ul>
diff --git a/app/components/layout/account_menu_component.rb b/app/components/layout/account_menu_component.rb
new file mode 100644
index 000000000..b8918c695
--- /dev/null
+++ b/app/components/layout/account_menu_component.rb
@@ -0,0 +1,7 @@
+class Layout::AccountMenuComponent < ApplicationComponent
+  attr_reader :user
+
+  def initialize(user)
+    @user = user
+  end
+end
diff --git a/app/components/layout/admin_header_component.html.erb b/app/components/layout/admin_header_component.html.erb
index 1b109bc18..05251335a 100644
--- a/app/components/layout/admin_header_component.html.erb
+++ b/app/components/layout/admin_header_component.html.erb
@@ -28,11 +28,7 @@
       <% if show_admin_menu?(user) || namespace != "management" %>
         <div id="responsive_menu">
           <div class="top-bar-right">
-            <ul class="menu" data-responsive-menu="medium-dropdown">
-              <%= render "shared/admin_login_items", current_user: user %>
-              <%= render "layouts/notification_item", current_user: user %>
-              <%= render "devise/menu/login_items", current_user: user %>
-            </ul>
+            <%= render Layout::AccountMenuComponent.new(user) %>
           </div>
         </div>
       <% end %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 1e101fa36..2351ddba8 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -26,11 +26,7 @@
 
     <div id="responsive-menu">
       <div class="top-bar-right">
-        <ul class="menu" data-responsive-menu="medium-dropdown">
-          <%= render "shared/admin_login_items" %>
-          <%= render "layouts/notification_item" %>
-          <%= render "devise/menu/login_items" %>
-        </ul>
+        <%= render Layout::AccountMenuComponent.new(current_user) %>
 
         <div class="show-for-small-only">
           <div class="subnavigation subnavigation-with-top-links">
diff --git a/app/views/layouts/_notification_item.html.erb b/app/views/layouts/_notification_item.html.erb
deleted file mode 100644
index 2e51085b6..000000000
--- a/app/views/layouts/_notification_item.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render Layout::NotificationItemComponent.new(current_user) %>