diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bd631d..2800288 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+- 2024-02-15: 2.17.1
+
+  - UX: fixed top menu when backlink to the site exists
+
 - 2024-02-15: 2.17.0
 
   - FEATURE: backlink to site
diff --git a/client-app/app/controllers/index.js b/client-app/app/controllers/index.js
index 81edfe3..639b7ee 100644
--- a/client-app/app/controllers/index.js
+++ b/client-app/app/controllers/index.js
@@ -39,6 +39,11 @@ export default class IndexController extends Controller {
     return Preload.get("back_to_site_link_path");
   }
 
+  @computed
+  get hasTopMenu() {
+    return this.backToSiteLinkText && this.backToSiteLinkPath;
+  }
+
   get actionsInMenu() {
     return (
       /mobile/i.test(navigator.userAgent) && !/iPad/.test(navigator.userAgent)
diff --git a/client-app/app/styles/app.css b/client-app/app/styles/app.css
index 6d10889..4796345 100644
--- a/client-app/app/styles/app.css
+++ b/client-app/app/styles/app.css
@@ -277,10 +277,22 @@ tbody tr {
   bottom: 320px;
   overflow: auto;
 }
+#top-panel.with-top-menu {
+  top: 35px;
+}
+
+#top-menu {
+  position: fixed;
+  z-index: 900;
+  left: 0;
+  top: 0;
+  width: 100%;
+}
 
 #back-to-site-panel {
   padding: 10px;
   background-color: #f1f1f1;
+  height: 15px;
 }
 
 .message-info {
diff --git a/client-app/app/templates/index.hbs b/client-app/app/templates/index.hbs
index 10f12da..1671050 100644
--- a/client-app/app/templates/index.hbs
+++ b/client-app/app/templates/index.hbs
@@ -1,8 +1,12 @@
-<div id="top-panel">
-  <BackToSiteLink
-    @path={{this.backToSiteLinkPath}}
-    @text={{this.backToSiteLinkText}}
-  />
+{{#if this.hasTopMenu}}
+  <div id="top-menu">
+    <BackToSiteLink
+      @path={{this.backToSiteLinkPath}}
+      @text={{this.backToSiteLinkText}}
+    />
+  </div>
+{{/if}}
+<div id="top-panel" class={{if this.hasTopMenu "with-top-menu"}}>
   <div id="log-table">
     {{#if this.model.moreBefore}}
       <div {{on "click" this.showMoreBefore}} class="show-more">
diff --git a/lib/logster/version.rb b/lib/logster/version.rb
index 2c568a7..1ea3594 100644
--- a/lib/logster/version.rb
+++ b/lib/logster/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Logster
-  VERSION = "2.17.0"
+  VERSION = "2.17.1"
 end