diff --git a/source/app.tsx b/source/app.tsx
index b365049..b6449c3 100644
--- a/source/app.tsx
+++ b/source/app.tsx
@@ -87,6 +87,7 @@ export default function App() {
 	const [loading, setLoading] = useState(true);
 	const [input, setInput] = useState('');
 	const [message, setMessage] = useState('');
+	const [editingField, setEditingField] = useState(false);
 
 	const refresh = useCallback(async () => {
 		if (view.type === 'edit') {
@@ -161,22 +162,31 @@ export default function App() {
 					{viewLabel}
 				</Text>
 				{isEditing ? (
-					<Box
-						flexDirection="column"
-						borderStyle="round"
-						borderColor="cyan"
-						paddingX={1}
-						width={50}
-					>
-						<EditView
-							task={view.task}
-							api={api}
-							onBack={() => {
-								setView({type: 'filter', query: homeFilter});
-								refresh();
-							}}
-						/>
-					</Box>
+					<>
+						<Box
+							flexDirection="column"
+							borderStyle="round"
+							borderColor="cyan"
+							paddingX={1}
+							width={50}
+						>
+							<EditView
+								task={view.task}
+								api={api}
+								onBack={() => {
+									setView({type: 'filter', query: homeFilter});
+									refresh();
+								}}
+								onEditingChange={setEditingField}
+							/>
+						</Box>
+						<Text dimColor>
+							{'  '}
+							{editingField
+								? 'Enter to save ∙ Escape to cancel'
+								: 'Enter to edit ∙ Escape to go back'}
+						</Text>
+					</>
 				) : (
 					<>
 						<Box
diff --git a/source/edit-view.tsx b/source/edit-view.tsx
index d56994c..a435de6 100644
--- a/source/edit-view.tsx
+++ b/source/edit-view.tsx
@@ -8,6 +8,7 @@ type EditViewProps = {
 	task: Task;
 	api: TodoistApi;
 	onBack: () => void;
+	onEditingChange: (editing: boolean) => void;
 };
 
 const fields = [
@@ -72,10 +73,20 @@ function buildUpdateArgs(key: string, value: string) {
 	}
 }
 
-export default function EditView({task, api, onBack}: EditViewProps) {
+export default function EditView({
+	task,
+	api,
+	onBack,
+	onEditingChange,
+}: EditViewProps) {
 	const [cursor, setCursor] = useState(0);
-	const [editing, setEditing] = useState(false);
+	const [editing, _setEditing] = useState(false);
 	const [editValue, setEditValue] = useState('');
+
+	const setEditing = (value: boolean) => {
+		_setEditing(value);
+		onEditingChange(value);
+	};
 	const [fieldValues, setFieldValues] = useState(() =>
 		Object.fromEntries(fields.map(f => [f.key, getFieldValue(task, f.key)])),
 	);
@@ -140,12 +151,6 @@ export default function EditView({task, api, onBack}: EditViewProps) {
 					)}
 				</Text>
 			))}
-			<Text>{''}</Text>
-			<Text dimColor>
-				{editing
-					? '  Enter to save ∙ Escape to cancel'
-					: '  Enter to edit ∙ Escape to go back'}
-			</Text>
 		</>
 	);
 }