diff --git a/src/actions/actionExport.tsx b/src/actions/actionExport.tsx
index 0fe032e67..043747a06 100644
--- a/src/actions/actionExport.tsx
+++ b/src/actions/actionExport.tsx
@@ -18,12 +18,12 @@ export const actionChangeProjectName = register({
     trackEvent("change", "title");
     return { appState: { ...appState, name: value }, commitToHistory: false };
   },
-  PanelComponent: ({ appState, updateData }) => (
+  PanelComponent: ({ appState, updateData, appProps }) => (
     <ProjectName
       label={t("labels.fileTitle")}
       value={appState.name || "Unnamed"}
       onChange={(name: string) => updateData(name)}
-      customName={appState.customName}
+      isNameEditable={typeof appProps.name !== "undefined"}
     />
   ),
 });
diff --git a/src/actions/manager.tsx b/src/actions/manager.tsx
index ef617776e..b242508b8 100644
--- a/src/actions/manager.tsx
+++ b/src/actions/manager.tsx
@@ -122,6 +122,7 @@ export class ActionManager implements ActionsManagerInterface {
           appState={this.getAppState()}
           updateData={updateData}
           id={id}
+          appProps={this.app.props}
         />
       );
     }
diff --git a/src/actions/types.ts b/src/actions/types.ts
index ae1baefec..26fa42449 100644
--- a/src/actions/types.ts
+++ b/src/actions/types.ts
@@ -1,6 +1,6 @@
 import React from "react";
 import { ExcalidrawElement } from "../element/types";
-import { AppState } from "../types";
+import { AppState, ExcalidrawProps } from "../types";
 
 /** if false, the action should be prevented */
 export type ActionResult =
@@ -94,6 +94,7 @@ export interface Action {
     elements: readonly ExcalidrawElement[];
     appState: AppState;
     updateData: (formData?: any) => void;
+    appProps: ExcalidrawProps;
     id?: string;
   }>;
   perform: ActionFn;
diff --git a/src/appState.ts b/src/appState.ts
index 3670e2faf..6b763e0c3 100644
--- a/src/appState.ts
+++ b/src/appState.ts
@@ -74,7 +74,6 @@ export const getDefaultAppState = (): Omit<
     zenModeEnabled: false,
     zoom: { value: 1 as NormalizedZoomValue, translation: { x: 0, y: 0 } },
     viewModeEnabled: false,
-    customName: false,
   };
 };
 
@@ -156,7 +155,6 @@ const APP_STATE_STORAGE_CONF = (<
   zenModeEnabled: { browser: true, export: false },
   zoom: { browser: true, export: false },
   viewModeEnabled: { browser: false, export: false },
-  customName: { browser: false, export: false },
 });
 
 const _clearAppStateForStorage = <ExportType extends "export" | "browser">(
diff --git a/src/components/App.tsx b/src/components/App.tsx
index b64e70f53..42585ec30 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -304,7 +304,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       zenModeEnabled = false,
       gridModeEnabled = false,
       theme = defaultAppState.theme,
-      name,
+      name = defaultAppState.name,
     } = props;
     this.state = {
       ...defaultAppState,
@@ -316,8 +316,7 @@ class App extends React.Component<ExcalidrawProps, AppState> {
       viewModeEnabled,
       zenModeEnabled,
       gridSize: gridModeEnabled ? GRID_SIZE : null,
-      name: name ? name : defaultAppState.name,
-      customName: typeof name === "string",
+      name,
     };
     if (excalidrawRef) {
       const readyPromise =
@@ -565,7 +564,6 @@ class App extends React.Component<ExcalidrawProps, AppState> {
               gridSize,
               theme,
               name,
-              customName: typeof this.props.name === "string",
             });
           },
           () => {
diff --git a/src/components/ProjectName.tsx b/src/components/ProjectName.tsx
index 4b701f5eb..067011f21 100644
--- a/src/components/ProjectName.tsx
+++ b/src/components/ProjectName.tsx
@@ -7,7 +7,7 @@ type Props = {
   value: string;
   onChange: (value: string) => void;
   label: string;
-  customName: boolean;
+  isNameEditable: boolean;
 };
 
 export class ProjectName extends Component<Props> {
@@ -44,7 +44,7 @@ export class ProjectName extends Component<Props> {
   };
 
   public render() {
-    return this.props.customName ? (
+    return this.props.isNameEditable ? (
       <span className="TextInput" aria-label={this.props.label}>
         {this.props.value}
       </span>
diff --git a/src/tests/__snapshots__/regressionTests.test.tsx.snap b/src/tests/__snapshots__/regressionTests.test.tsx.snap
index c9828f48a..ee0f830c5 100644
--- a/src/tests/__snapshots__/regressionTests.test.tsx.snap
+++ b/src/tests/__snapshots__/regressionTests.test.tsx.snap
@@ -19,7 +19,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -481,7 +480,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -949,7 +947,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": "id10",
@@ -1726,7 +1723,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -1931,7 +1927,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -2390,7 +2385,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -2644,7 +2638,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -2809,7 +2802,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -3287,7 +3279,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -3596,7 +3587,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -3801,7 +3791,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -4046,7 +4035,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -4299,7 +4287,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -4661,7 +4648,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": Object {
     "angle": 0,
     "backgroundColor": "transparent",
@@ -4957,7 +4943,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": Object {
     "angle": 0,
     "backgroundColor": "transparent",
@@ -5265,7 +5250,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": Object {
     "angle": 0,
     "backgroundColor": "transparent",
@@ -5474,7 +5458,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": Object {
     "angle": 0,
     "backgroundColor": "transparent",
@@ -5661,7 +5644,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": "id3",
@@ -6115,7 +6097,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -6434,7 +6415,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -8469,7 +8449,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -8832,7 +8811,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -9088,7 +9066,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -9342,7 +9319,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -9658,7 +9634,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -9823,7 +9798,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -9988,7 +9962,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -10153,7 +10126,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -10348,7 +10320,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -10543,7 +10514,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -10738,7 +10708,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -10933,7 +10902,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -11098,7 +11066,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -11263,7 +11230,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -11458,7 +11424,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -11623,7 +11588,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -11818,7 +11782,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -12535,7 +12498,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -12789,7 +12751,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -12892,7 +12853,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -12993,7 +12953,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -13158,7 +13117,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -13467,7 +13425,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -13776,7 +13733,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -13941,7 +13897,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -14138,7 +14093,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -14388,7 +14342,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -14713,7 +14666,6 @@ Object {
   "currentItemStrokeWidth": 2,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -15553,7 +15505,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -15862,7 +15813,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -16171,7 +16121,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -16551,7 +16500,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -16719,7 +16667,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -17041,7 +16988,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -17281,7 +17227,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -17537,7 +17482,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -17865,7 +17809,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -17966,7 +17909,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -18131,7 +18073,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -18953,7 +18894,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -19054,7 +18994,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": "id3",
@@ -19787,7 +19726,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": Object {
     "angle": 0,
     "backgroundColor": "transparent",
@@ -20193,7 +20131,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": Object {
     "angle": 0,
     "backgroundColor": "transparent",
@@ -20489,7 +20426,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "down",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -20592,7 +20528,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -21091,7 +21026,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
@@ -21192,7 +21126,6 @@ Object {
   "currentItemStrokeWidth": 1,
   "currentItemTextAlign": "left",
   "cursorButton": "up",
-  "customName": false,
   "draggingElement": null,
   "editingElement": null,
   "editingGroupId": null,
diff --git a/src/types.ts b/src/types.ts
index 4e2bb5cc1..edc738973 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -93,7 +93,6 @@ export type AppState = {
   theme: "light" | "dark";
   gridSize: number | null;
   viewModeEnabled: boolean;
-  customName: boolean;
 
   /** top-most selected groups (i.e. does not include nested groups) */
   selectedGroupIds: { [groupId: string]: boolean };