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 2b85c93..2ea84d4 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Plugin/DisplayPageTest.php
@@ -81,6 +81,14 @@ public function testPageResponses() {
     $subrequest = Request::create('/test_page_display_200', 'GET');
     $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
     $this->assertEqual($response->getStatusCode(), 200);
+
+    // Test accessing a disabled page for a view.
+    $view = views_get_view('test_page_display');
+    // Disable the view, rebuild menu, and request the page again.
+    $view->storage->disable()->save();
+    $subrequest = Request::create('/test_page_display_200', 'GET');
+    $response = $this->container->get('http_kernel')->handle($subrequest, HttpKernelInterface::SUB_REQUEST);
+    $this->assertEqual($response->getStatusCode(), 404);
   }
 
   /**
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 49f0c58..4e74450 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 3606a71..c80f1c7 100644
--- a/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+++ b/core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
@@ -114,7 +114,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');