diff --git a/packages/editor/src/core/editor.tsx b/packages/editor/src/core/editor.tsx
index 23f1de76b8..01c4711e35 100644
--- a/packages/editor/src/core/editor.tsx
+++ b/packages/editor/src/core/editor.tsx
@@ -40,20 +40,18 @@ export function Editor(props: EditorProps) {
       <DndWrapper>
         <HotkeysProvider initiallyActiveScopes={['global']}>
           {/* only on serlo for now */}
-          {isSerlo ? (
+          {isSerlo && !isSerloEditorPreviewPage ? (
             <>
-              {isSerloEditorPreviewPage ? null : <EditorToolbar />}
+              <EditorToolbar />
               <LocalStorageNotice
                 useStored={useStored}
                 setUseStored={setUseStored}
               />
             </>
-          ) : (
-            // For non serlo environments, we need to render the toaster
-            // https://react-hot-toast.com/docs/toaster (already gets rendered
-            // in the web project)
-            <Toaster />
-          )}
+          ) : null}
+          {/* For non serlo environments, we need to render the toaster
+          (already gets rendered in the web project) */}
+          {!isSerlo ? <Toaster /> : null}
           <div
             className={cn(
               'editor-core mb-24 text-lg leading-cozy',