diff --git a/src/js/Main.tsx b/src/js/Main.tsx
index 210aa2d9c..50475e925 100644
--- a/src/js/Main.tsx
+++ b/src/js/Main.tsx
@@ -45,10 +45,7 @@ type ReactState = {
 
 class Main extends Component<Props, ReactState> {
   componentDidMount() {
-    window.onload = () => {
-      // this makes sure that window.nostr is there
-      localState.get('loggedIn').on(this.inject());
-    };
+    localState.get('loggedIn').on(this.inject());
     // iris.electron && iris.electron.get('platform').on(this.inject());
     localState.get('unseenMsgsTotal').on(this.inject());
     translationLoaded.then(() => this.setState({ translationLoaded: true }));
diff --git a/src/js/nostr/IndexedDB.ts b/src/js/nostr/IndexedDB.ts
index 1b7f642a9..f688a676b 100644
--- a/src/js/nostr/IndexedDB.ts
+++ b/src/js/nostr/IndexedDB.ts
@@ -21,8 +21,8 @@ export class MyDexie extends Dexie {
   constructor() {
     super('iris');
 
-    this.version(4).stores({
-      events: 'id, pubkey, kind, created_at',
+    this.version(5).stores({
+      events: 'id, pubkey, kind, created_at, [pubkey+kind]',
       tags: 'id, eventId, [type+value]',
     });
   }
diff --git a/src/js/views/feeds/Global.tsx b/src/js/views/feeds/Global.tsx
index 28fa7b59e..62d5b2e29 100644
--- a/src/js/views/feeds/Global.tsx
+++ b/src/js/views/feeds/Global.tsx
@@ -6,6 +6,7 @@ import OnboardingNotification from '@/components/onboarding/OnboardingNotificati
 import { getEventReplyingTo } from '@/nostr/utils';
 import { translate as t } from '@/translations/Translation.mjs';
 import { RouteProps } from '@/views/types.ts';
+import View from '@/views/View.tsx';
 
 const Global: React.FC<RouteProps> = () => {
   const filterOptions = useMemo(
@@ -26,15 +27,17 @@ const Global: React.FC<RouteProps> = () => {
   );
 
   return (
-    <div className="flex flex-row">
-      <div className="flex flex-col w-full">
-        <OnboardingNotification />
-        <div className="hidden md:block px-4">
-          <CreateNoteForm autofocus={false} placeholder={t('whats_on_your_mind')} />
+    <View>
+      <div className="flex flex-row">
+        <div className="flex flex-col w-full">
+          <OnboardingNotification />
+          <div className="hidden md:block px-4">
+            <CreateNoteForm autofocus={false} placeholder={t('whats_on_your_mind')} />
+          </div>
+          <FeedComponent filterOptions={filterOptions} />
         </div>
-        <FeedComponent filterOptions={filterOptions} />
       </div>
-    </div>
+    </View>
   );
 };