diff --git a/client/my-sites/themes/index.node.js b/client/my-sites/themes/index.node.js
index <HASH>..<HASH> 100644
--- a/client/my-sites/themes/index.node.js
+++ b/client/my-sites/themes/index.node.js
@@ -12,5 +12,6 @@ export default function( router ) {
 	if ( config.isEnabled( 'manage/themes' ) ) {
 		router( '/design', makeLayout );
 		router( '/design/type/:tier', makeLayout );
+		router( '/design/*', makeLayout ); // Needed so direct hits don't result in a 404.
 	}
 }
Themes: Add catch-all route to avoid <I> for single-site view