diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php
index b2badea..9c982d2 100644
--- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php
+++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/DeviceFormController.php
@@ -18,7 +18,7 @@ class DeviceFormController extends EntityFormController {
   /**
    * {@inheritdoc}
    */
-  public function form(array $form, array &$form_state) {
+  public function form(array $form, array &$form_state, EntityInterface $responsive_preview_device = NULL) {
     $entity = $this->entity;
     $form['label'] = array(
       '#type' => 'textfield',
diff --git a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php
index c641da3..5abbde9 100644
--- a/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php
+++ b/core/modules/responsive_preview/lib/Drupal/responsive_preview/Plugin/Core/Entity/Device.php
@@ -22,7 +22,8 @@
  *     "storage" = "Drupal\Core\Config\Entity\ConfigStorageController",
  *     "list" = "Drupal\responsive_preview\DeviceListController",
  *     "form" = {
- *       "default" = "Drupal\responsive_preview\DeviceFormController"
+ *       "edit" = "Drupal\responsive_preview\DeviceFormController",
+ *       "add" = "Drupal\responsive_preview\DeviceFormController"
  *     }
  *   },
  *   config_prefix = "responsive_preview.device",
diff --git a/core/modules/responsive_preview/responsive_preview.routing.yml b/core/modules/responsive_preview/responsive_preview.routing.yml
index 698c8c6..6a89138 100644
--- a/core/modules/responsive_preview/responsive_preview.routing.yml
+++ b/core/modules/responsive_preview/responsive_preview.routing.yml
@@ -9,14 +9,21 @@ responsive_preview_device_list:
 responsive_preview_device_add:
   pattern: '/admin/config/content/responsive_preview/add'
   defaults:
-    _entity_form: responsive_preview_device.default
+    _entity_form: responsive_preview_device.add
   requirements:
     _permission: 'administer site configuration'
 
 responsive_preview_device_edit:
   pattern: '/admin/config/content/responsive_preview/manage/{responsive_preview_device}'
   defaults:
-    _entity_form: responsive_preview_device.default
+    _entity_form: responsive_preview_device.edit
+  requirements:
+    _permission: 'administer site configuration'
+
+responsive_preview_device_edit_tab:
+  pattern: '/admin/config/content/responsive_preview/manage/{responsive_preview_device}/edit'
+  defaults:
+    _entity_form: responsive_preview_device.edit
   requirements:
     _permission: 'administer site configuration'