diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
index 9a15ad8..c1a8c03 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
@@ -29,8 +29,8 @@
   public function init(array &$form_state) {
     parent::init($form_state);
 
-    if (!$this->displayID) {
-      $this->displayID = drupal_container()->get('request')->attributes->get('display_id');
+    if ($display_id = drupal_container()->get('request')->attributes->get('display_id')) {
+      $this->displayID = $display_id;
     }
 
     // @todo Remove the need for this.