diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index 6620477..a20d12d 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -89,41 +89,39 @@ function _content_translation_form_language_content_settings_form_alter(array &$
       // to be able to skip alterations.
       $form['settings'][$entity_type_id][$bundle]['settings']['language']['#content_translation_skip_alter'] = TRUE;
 
-      // Only show the checkbox to enable translation if the bundles in the
-      // entity might have fields and if there are fields to translate.
-      if ($entity_type->isFieldable()) {
-        $fields = $entity_manager->getFieldDefinitions($entity_type_id, $bundle);
-        if ($fields) {
-          $form['settings'][$entity_type_id][$bundle]['translatable'] = array(
-            '#type' => 'checkbox',
-            '#default_value' => content_translation_enabled($entity_type_id, $bundle),
-          );
-
-          $field_settings = content_translation_get_config($entity_type_id, $bundle, 'fields');
-          foreach ($fields as $field_name => $definition) {
-            // Allow to configure only fields supporting multilingual storage.
-            if (!empty($storage_definitions[$field_name]) && $storage_definitions[$field_name]->isTranslatable()) {
-              $form['settings'][$entity_type_id][$bundle]['fields'][$field_name] = array(
-                '#label' => $definition->getLabel(),
-                '#type' => 'checkbox',
-                '#default_value' => $definition->isTranslatable(),
-              );
-              // Display the column translatability configuration widget.
-              // @todo Remove this special casing when arbitrary settings can be
-              //   stored for any field. See https://drupal.org/node/2224761.
-              if ($definition instanceof FieldInstanceConfigInterface) {
-                $column_element = content_translation_field_sync_widget($definition);
-                if ($column_element) {
-                  $form['settings'][$entity_type_id][$bundle]['columns'][$field_name] = $column_element;
-                  // @todo This should not concern only files.
-                  if (isset($column_element['#options']['file'])) {
-                    $dependent_options_settings["settings[{$entity_type_id}][{$bundle}][columns][{$field_name}]"] = array('file');
-                  }
+      $fields = $entity_manager->getFieldDefinitions($entity_type_id, $bundle);
+      if ($fields) {
+        foreach ($fields as $field_name => $definition) {
+          // Allow to configure only fields supporting multilingual storage.
+          if (!empty($storage_definitions[$field_name]) && $storage_definitions[$field_name]->isTranslatable()) {
+            $form['settings'][$entity_type_id][$bundle]['fields'][$field_name] = array(
+              '#label' => $definition->getLabel(),
+              '#type' => 'checkbox',
+              '#default_value' => $definition->isTranslatable(),
+            );
+            // Display the column translatability configuration widget.
+            // @todo Remove this special casing when arbitrary settings can be
+            //   stored for any field. See https://drupal.org/node/2224761.
+            if ($definition instanceof FieldInstanceConfigInterface) {
+              $column_element = content_translation_field_sync_widget($definition);
+              if ($column_element) {
+                $form['settings'][$entity_type_id][$bundle]['columns'][$field_name] = $column_element;
+                // @todo This should not concern only files.
+                if (isset($column_element['#options']['file'])) {
+                  $dependent_options_settings["settings[{$entity_type_id}][{$bundle}][columns][{$field_name}]"] = array('file');
                 }
               }
             }
           }
         }
+        if (!empty($form['settings'][$entity_type_id][$bundle]['fields'])) {
+          // Only show the checkbox to enable translation if the bundles in the
+          // entity might have fields and if there are fields to translate.
+          $form['settings'][$entity_type_id][$bundle]['translatable'] = array(
+            '#type' => 'checkbox',
+            '#default_value' => content_translation_enabled($entity_type_id, $bundle),
+          );
+        }
       }
     }
   }
diff --git a/core/modules/shortcut/shortcut.links.task.yml b/core/modules/shortcut/shortcut.links.task.yml
index b9f8bc2..d42c46e 100644
--- a/core/modules/shortcut/shortcut.links.task.yml
+++ b/core/modules/shortcut/shortcut.links.task.yml
@@ -12,3 +12,8 @@ entity.shortcut_set.edit_form:
   route_name: entity.shortcut_set.edit_form
   base_route: entity.shortcut_set.customize_form
   weight: 10
+
+entity.shortcut.canonical:
+  route_name: entity.shortcut.canonical
+  base_route: entity.shortcut.canonical
+  title: Edit