diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index 17752de10cd..7251560cb65 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -31,6 +31,11 @@
 <?php foreach ($_['initialStates'] as $app => $initialState) { ?>
 	<input type="hidden" id="initial-state-<?php p($app); ?>" value="<?php p(base64_encode($initialState)); ?>">
 <?php }?>
+	<div id="skip-actions">
+		<?php if ($_['id-app-content'] !== null) { ?><a href="<?php p($_['id-app-content']); ?>" class="button primary skip-navigation skip-content"><?php p($l->t('Skip to main content')); ?></a><?php } ?>
+		<?php if ($_['id-app-navigation'] !== null) { ?><a href="<?php p($_['id-app-navigation']); ?>" class="button primary skip-navigation"><?php p($l->t('Skip to navigation of app')); ?></a><?php } ?>
+	</div>
+
 	<div id="notification-container">
 		<div id="notification"></div>
 	</div>
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index 96b785b2e1c..37f459ca52d 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -282,8 +282,8 @@ class TemplateLayout extends \OC_Template {
 
 		$this->assign('initialStates', $this->initialState->getInitialStates());
 
-		$this->assign('id-app-content', '#app-content');
-		$this->assign('id-app-navigation', '#app-navigation');
+		$this->assign('id-app-content', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-content' : '#content');
+		$this->assign('id-app-navigation', $renderAs === TemplateResponse::RENDER_AS_USER ? '#app-navigation' : null);
 	}
 
 	/**