diff --git a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
index 2ae57b4..1deee30 100644
--- a/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
+++ b/core/modules/views/tests/src/Unit/EventSubscriber/RouteSubscriberTest.php
@@ -164,8 +164,8 @@ protected function setupMocks() {
       ->method('load')
       ->will($this->returnValue($view));
 
-    $view->expects($this->any())
-      ->method('getExecutable')
+    $this->viewExecutableFactory->expects($this->any())
+      ->method('get')
       ->will($this->returnValue($executable));
     $view->expects($this->any())
       ->method('id')
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index ccd3ac8..8ef8e31 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -628,8 +628,10 @@ public function submitDisplayUndoDelete($form, FormStateInterface $form_state) {
   public function submitDisplayEnable($form, FormStateInterface $form_state) {
     $view = $this->entity;
     $id = $form_state->get('display_id');
+    $executable = $this->executableFactory->get($view);
+    $executable->initDisplay();
     // setOption doesn't work because this would might affect upper displays
-    $this->executableFactory->get($view)->displayHandlers->get($id)->setOption('enabled', TRUE);
+    $executable->displayHandlers->get($id)->setOption('enabled', TRUE);
 
     // Store in cache
     $view->cacheSet();