diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index ea3664e..0d4b585 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -298,6 +298,18 @@ public function calculateDependencies() {
   /**
    * {@inheritdoc}
    */
+  public function preSave(EntityStorageInterface $storage) {
+    parent::preSave($storage);
+
+    // Sort the displays.
+    $display = $this->get('display');
+    ksort($display);
+    $this->set('display', array('default' => $display['default']) + $display);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
   public function postSave(EntityStorageInterface $storage, $update = TRUE) {
     parent::postSave($storage, $update);
 
@@ -390,13 +402,6 @@ public function mergeDefaultDisplaysOptions() {
       // Add the defaults for the display.
       $displays[$key] = $options;
     }
-    // Sort the displays.
-    uasort($displays, function ($display1, $display2) {
-      if ($display1['position'] != $display2['position']) {
-        return $display1['position'] < $display2['position'] ? -1 : 1;
-      }
-      return 0;
-    });
     $this->set('display', $displays);
   }