diff --git a/app/projects/[id]/editor/page.tsx b/app/projects/[id]/editor/page.tsx
index f098c558..6933a404 100644
--- a/app/projects/[id]/editor/page.tsx
+++ b/app/projects/[id]/editor/page.tsx
@@ -12,7 +12,6 @@ import { CommitMessageDialog } from "@/components/editor/CommitMessageDialog";
 import { AddEntityDialog, type NewEntityInfo } from "@/components/editor/AddEntityDialog";
 import { useToast } from "@/lib/context/ToastContext";
 import { ModeSwitcher } from "@/components/editor/ModeSwitcher";
-import { ContinuousEditingToggle } from "@/components/editor/ContinuousEditingToggle";
 import { DeveloperEditorLayout } from "@/components/editor/developer/DeveloperEditorLayout";
 import { StandardEditorLayout } from "@/components/editor/standard/StandardEditorLayout";
 import { BranchSelector, RevisionHistoryPanel, HistoryButton } from "@/components/revision";
@@ -823,18 +822,17 @@ export default function EditorPage() {
           <div className="flex items-center justify-between">
             <div className="flex items-center gap-4">
               <Link
-                href={`/projects/${projectId}`}
+                href={`/projects/${projectId}${selectedIri ? `?classIri=${encodeURIComponent(selectedIri)}` : ""}`}
                 className="flex items-center gap-2 text-sm text-slate-600 hover:text-slate-900 dark:text-slate-400 dark:hover:text-slate-200"
               >
-                <ArrowLeft className="h-4 w-4" />
-                Back
+                <Eye className="h-4 w-4" />
+                Close Editor
               </Link>
               <div className="h-5 w-px bg-slate-200 dark:bg-slate-700" />
               <h1 className="font-semibold text-slate-900 dark:text-white">{project.name}</h1>
               <span className="text-sm text-slate-500 dark:text-slate-400">{totalClasses} classes</span>
               {/* Mode Switcher */}
               <ModeSwitcher />
-              {canSuggest && <ContinuousEditingToggle />}
 
               {/* Suggestion mode indicator */}
               {isSuggestionMode && (
diff --git a/app/projects/[id]/page.tsx b/app/projects/[id]/page.tsx
index 490ad2a0..5d755474 100644
--- a/app/projects/[id]/page.tsx
+++ b/app/projects/[id]/page.tsx
@@ -258,7 +258,7 @@ function ViewerContent({
 
               {/* Open Editor / Sign In */}
               {canSuggest ? (
-                <Link href={`/projects/${projectId}/editor`}>
+                <Link href={`/projects/${projectId}/editor${selectedIri ? `?classIri=${encodeURIComponent(selectedIri)}` : ""}`}>
                   <Button size="sm" className="gap-2">
                     <Pencil className="h-4 w-4" />
                     <span className="hidden sm:inline">Open Editor</span>