diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md
index 0bdd1aaa14..0607e9cfc8 100644
--- a/CHANGELOG.unreleased.md
+++ b/CHANGELOG.unreleased.md
@@ -27,6 +27,7 @@ For upgrade instructions, please check the [migration guide](MIGRATIONS.released
 - Fixed that the UI allowed mutating trees in the tree tab (dragging/creating/deleting trees and groups) in read-only tracings. [#5573](https://github.com/scalableminds/webknossos/pull/5573)
 - Fixed "Create a new tree group for this file" setting in front-end import when a group id of 0 was used in the NML. [#5573](https://github.com/scalableminds/webknossos/pull/5573)
 - Fixed a bug that caused a distortion when moving or zooming in the maximized 3d viewport. [#5550](https://github.com/scalableminds/webknossos/pull/5550)
+- Fixed a bug that prevented focusing the login fields when being prompted to login after trying to view a dataset without being logged in.[#5521](https://github.com/scalableminds/webknossos/pull/5577)
 
 ### Removed
 -
diff --git a/frontend/javascripts/oxalis/view/layouting/tracing_layout_view.js b/frontend/javascripts/oxalis/view/layouting/tracing_layout_view.js
index 060343495c..ba773961b3 100644
--- a/frontend/javascripts/oxalis/view/layouting/tracing_layout_view.js
+++ b/frontend/javascripts/oxalis/view/layouting/tracing_layout_view.js
@@ -345,7 +345,7 @@ class TracingLayoutView extends React.PureComponent<PropsWithRouter, State> {
             <Layout style={{ display: "flex" }}>
               <MergerModeController />
               <div id={canvasAndLayoutContainerID} style={{ width: "100%", height: "100%" }}>
-                <TracingView />
+                {status !== "failedLoading" && <TracingView />}
                 {status === "loaded" ? (
                   <FlexLayoutWrapper
                     onLayoutChange={this.onLayoutChange}