diff --git a/src/Form/EntityCloneForm.php b/src/Form/EntityCloneForm.php
index 944629e..a7151ab 100644
--- a/src/Form/EntityCloneForm.php
+++ b/src/Form/EntityCloneForm.php
@@ -145,12 +145,13 @@ class EntityCloneForm extends FormBase {
       '@type' => $this->entity->getEntityTypeId(),
     ]));
 
-    if ($cloned_entity && $cloned_entity->hasLinkTemplate('canonical')) {
-      $form_state->setRedirect($cloned_entity->toUrl()
-        ->getRouteName(), $cloned_entity->toUrl()->getRouteParameters());
+    if ($cloned_entity && $cloned_entity->hasLinkTemplate('edit-form')) {
+      $form_state->setRedirect($cloned_entity->toUrl('edit-form')
+        ->getRouteName(), $cloned_entity->toUrl('edit-form')->getRouteParameters());
+    }
+    else {
+      $form_state->setRedirect('<front>');
     }
-
-    $form_state->setRedirect('<front>');
   }
 
   /**