diff --git a/src/core/webcaosdb.xsl b/src/core/webcaosdb.xsl
index de4bdc9a5728da61799b05b23f5030ed25dfbc4a..ff12c424743d5b7cb9294f3284b22b147fb94942 100644
--- a/src/core/webcaosdb.xsl
+++ b/src/core/webcaosdb.xsl
@@ -46,9 +46,7 @@
</head>
<body>
<xsl:call-template name="caosdb-top-navbar" />
- <xsl:call-template name="paging-panel"/>
<xsl:call-template name="caosdb-data-container" />
- <xsl:call-template name="paging-panel"/>
<footer>
<xsl:call-template name="caosdb-footer"/>
</footer>
diff --git a/src/core/xsl/main.xsl b/src/core/xsl/main.xsl
index 21f1eefa686b450738a5945ed2c46495152699c6..038b9765bcf263dca7aeafa91a6f2f28c11401f5 100644
--- a/src/core/xsl/main.xsl
+++ b/src/core/xsl/main.xsl
@@ -222,6 +222,7 @@
<div class="container caosdb-f-main">
<div class="row caosdb-v-main-col">
<div class="panel-group caosdb-f-main-entities">
+ <xsl:call-template name="paging-panel"/>
<xsl:apply-templates select="/Response/UserInfo"/>
<xsl:apply-templates mode="top-level-data" select="/Response/*"/>
<xsl:apply-templates mode="query-results" select="/Response/Query"/>
@@ -231,6 +232,7 @@
<xsl:if test="count(/Response/*)<2 and not(/Response/Error|/Response/Info|/Response/Warning)">
<xsl:call-template name="welcome"/>
</xsl:if>
+ <xsl:call-template name="paging-panel"/>
</div>
</div>
<div class="panel panel-warning caosdb-f-edit caosdb-v-edit-panel caosdb-v-edit-panel hidden">