diff --git a/src/app.jsx b/src/app.jsx
index d73e2a08..86cfb728 100644
--- a/src/app.jsx
+++ b/src/app.jsx
@@ -249,7 +249,8 @@ function App() {
         <Route path="/:instance?/s/:id" element={<Status />} />
       </Routes>
       <div>
-        {!snapStates.settings.shortcutsColumnsMode &&
+        {isLoggedIn &&
+          !snapStates.settings.shortcutsColumnsMode &&
           snapStates.settings.shortcutsViewMode !== 'multi-column' && (
             <Shortcuts />
           )}
diff --git a/src/utils/api.js b/src/utils/api.js
index c1b9fda4..15522581 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -93,6 +93,8 @@ export async function initAccount(client, instance, accessToken) {
   const masto = client;
   const mastoAccount = await masto.v1.accounts.verifyCredentials();
 
+  store.session.set('currentAccount', mastoAccount.id);
+
   saveAccount({
     info: mastoAccount,
     instanceURL: instance.toLowerCase(),