diff --git a/app/views/homescreen/index.html.erb b/app/views/homescreen/index.html.erb
index 3c94cb5afe..db8fd0c9b7 100644
--- a/app/views/homescreen/index.html.erb
+++ b/app/views/homescreen/index.html.erb
@@ -34,12 +34,6 @@ See doc/COPYRIGHT.rdoc for more details.
   </h2>
 </div>
 
-<% if show_onboarding_modal? %>
-  <modal-wrapper initialize="true" iframe-url="<%= OpenProject::Configuration.onboarding_video_url %>" modal-params="{ appendClassName: 'onboarding-modal modal-wrapper' }">
-    <%= render partial: '/onboarding/starting_video_modal' %>
-  </modal-wrapper>
-<% end %>
-
 <%= render partial: 'announcements/show' %>
 
 <% if @homescreen[:blocks].any? %>
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 7c8370f52a..786850099b 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -141,6 +141,11 @@ See doc/COPYRIGHT.rdoc for more details.
           <% end %>
           <%= render_flash_messages %>
           <notifications></notifications>
+          <% if show_onboarding_modal? %>
+            <modal-wrapper initialize="true" iframe-url="<%= OpenProject::Configuration.onboarding_video_url %>" modal-params="{ appendClassName: 'onboarding-modal modal-wrapper' }">
+              <%= render partial: '/onboarding/starting_video_modal' %>
+            </modal-wrapper>
+          <% end %>
           <div id="content" class="<%= initial_classes %>"
                ng-class="{ 'hidden-navigation': !showNavigation }">
             <h1 class="hidden-for-sighted"><%= l(:label_content) %></h1>