diff --git a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
index 49ed01c..3aa662a 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
@@ -46,6 +46,14 @@ public function testPageResponses() {
     $this->assertResponse(403);
     $this->drupalGet('test_page_display_404');
     $this->assertResponse(404);
+
+    // Test accessing a page for a disabled view.
+    $this->drupalGet('test_page_display_disabled');
+    $this->assertResponse(200);
+    // Disable the view, rebuild menu, and request the page again.
+    $view->storage->disable()->save();
+    $this->drupalGet('test_page_display_disabled');
+    $this->assertResponse(404);
   }
 
 }
diff --git a/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml b/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
index 01f50ff..75ed2cb 100644
--- a/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
+++ b/core/modules/views/tests/views_test_config/test_views/views.view.test_page_display.yml
@@ -19,14 +19,21 @@ display:
     display_plugin: page
     display_title: Page
     id: page_1
-    position: '0'
+    position: '1'
   page_2:
     display_options:
       path: test_page_display_404
     display_plugin: page
     display_title: Page
     id: page_2
-    position: '0'
+    position: '2'
+  page_3:
+    display_options:
+      path: test_page_display_disabled
+    display_plugin: page
+    display_title: Page
+    id: page_3
+    position: '3'
 label: ''
 id: test_page_display
 tag: ''
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
index b3ded3b..a2e7d29 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php
@@ -307,4 +307,24 @@ public function testPageContextualLinks() {
     $this->assertIdentical($json[$id], '<ul class="contextual-links"><li class="views-ui-edit odd first last"><a href="' . base_path() . 'admin/structure/views/view/test_display/edit/page_1?destination=test-display">Edit view</a></li></ul>');
   }
 
+  /**
+   * Tests that the view status is correctly reflected on the edit form.
+   */
+  public function testViewStatus() {
+    $view = $this->randomView();
+    $id = $view['id'];
+
+    // The view should initially have the enabled class on it's form wrapper.
+    $this->drupalGet('admin/structure/views/view/' . $id);
+    $elements = $this->xpath('//div[contains(@class, :edit) and contains(@class, :status)]', array(':edit' => 'views-edit-view', ':status' => 'enabled'));
+    $this->assertTrue($elements, 'The enabled class was found on the form wrapper');
+
+    $view = views_get_view($id);
+    $view->storage->disable()->save();
+
+    $this->drupalGet('admin/structure/views/view/' . $id);
+    $elements = $this->xpath('//div[contains(@class, :edit) and contains(@class, :status)]', array(':edit' => 'views-edit-view', ':status' => 'disabled'));
+    $this->assertTrue($elements, 'The disabled class was found on the form wrapper.');
+  }
+
 }
diff --git a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
index 9f3e0b6..94f9736 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -68,7 +68,9 @@ public function form(array $form, array &$form_state) {
       '#prefix' => '',
       '#suffix' => '',
     );
-    $form['#prefix'] .= '<div class="views-edit-view views-admin clearfix">';
+
+    $view_status = $view->status() ? 'enabled' : 'disabled';
+    $form['#prefix'] .= '<div class="views-edit-view views-admin ' . $view_status . ' clearfix">';
     $form['#suffix'] = '</div>' . $form['#suffix'];
 
     $form['#attributes']['class'] = array('form-edit');