diff --git a/source/layouts/two_column_layout.haml b/source/layouts/two_column_layout.haml
index bc2e8d9bc7..202d4d487e 100644
--- a/source/layouts/two_column_layout.haml
+++ b/source/layouts/two_column_layout.haml
@@ -1,7 +1,7 @@
 - is_command = command?(current_page.url) || whats_new?(current_page.url)
 - v = current_page.url.scan(/v\d\.\d+/).first || current_version
 
-- if current_page.destination_path.start_with?(current_version)
+- if /v\d\.\d+\//.match?(current_page.destination_path)
   - content_for(:canonical, commands_toplevel_path(current_page.destination_path))
 
 ~ wrap_layout :base do