diff --git a/packages/edit-site/src/components/site-editor-routes/templates.js b/packages/edit-site/src/components/site-editor-routes/templates.js
index cb9f650bbf926..06ba07fcd0659 100644
--- a/packages/edit-site/src/components/site-editor-routes/templates.js
+++ b/packages/edit-site/src/components/site-editor-routes/templates.js
@@ -1,10 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
 /**
  * Internal dependencies
  */
 import Editor from '../editor';
 import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen-templates-browse';
+import { unlock } from '../../lock-unlock';
 import PageTemplates from '../page-templates';
 
+const { useLocation } = unlock( routerPrivateApis );
+
+function MobileTemplatesView() {
+	const { query = {} } = useLocation();
+	const { canvas = 'view' } = query;
+
+	return canvas === 'edit' ? (
+		<Editor />
+	) : (
+		<SidebarNavigationScreenTemplatesBrowse backPath="/" />
+	);
+}
+
 export const templatesRoute = {
 	name: 'templates',
 	path: '/template',
@@ -15,7 +34,7 @@ export const templatesRoute = {
 			const isListView = query.layout === 'list';
 			return isListView ? <Editor /> : undefined;
 		},
-		mobile: <PageTemplates />,
+		mobile: <MobileTemplatesView />,
 	},
 	widths: {
 		content( { query } ) {