diff --git a/module/release/ui/create.html.php b/module/release/ui/create.html.php
index 783e927824..b1b704d97c 100644
--- a/module/release/ui/create.html.php
+++ b/module/release/ui/create.html.php
@@ -84,6 +84,18 @@ formPanel
         )
     ),
     formRow
+    (
+        formGroup
+        (
+            set::width('1/4'),
+            set::name('status'),
+            set::label($lang->release->status),
+            set::control(array('control' => 'picker', 'required' => true)),
+            set::value($status),
+            set::items($lang->release->statusList)
+        )
+    ),
+    formRow
     (
         formGroup
         (
@@ -106,18 +118,6 @@ formPanel
             set::control('date')
         )
     ),
-    formRow
-    (
-        formGroup
-        (
-            set::width('1/4'),
-            set::name('status'),
-            set::label($lang->release->status),
-            set::control(array('control' => 'picker', 'required' => true)),
-            set::value($status),
-            set::items($lang->release->statusList)
-        )
-    ),
     formGroup
     (
         set::label($lang->release->desc),
diff --git a/module/release/ui/edit.html.php b/module/release/ui/edit.html.php
index 627e17cbde..869d92b456 100644
--- a/module/release/ui/edit.html.php
+++ b/module/release/ui/edit.html.php
@@ -10,6 +10,7 @@ declare(strict_types=1);
  */
 namespace zin;
 
+jsVar('oldStatus', $release->status);
 formPanel
 (
     set::title($lang->release->edit),
@@ -53,6 +54,18 @@ formPanel
         )
     ),
     formRow
+    (
+        formGroup
+        (
+            set::width('1/4'),
+            set::name('status'),
+            set::label($lang->release->status),
+            set::control(array('control' => 'picker', 'required' => true)),
+            set::value($release->status),
+            set::items($lang->release->statusList)
+        )
+    ),
+    formRow
     (
         formGroup
         (
@@ -65,6 +78,7 @@ formPanel
     ),
     formRow
     (
+        $release->status == 'wait' ? setClass('hidden') : null,
         formGroup
         (
             set::width('1/4'),
@@ -74,18 +88,6 @@ formPanel
             set::control('date')
         )
     ),
-    formRow
-    (
-        formGroup
-        (
-            set::width('1/4'),
-            set::name('status'),
-            set::label($lang->release->status),
-            set::control(array('control' => 'picker', 'required' => true)),
-            set::value($release->status),
-            set::items($lang->release->statusList)
-        )
-    ),
     formGroup
     (
         set::label($lang->release->desc),