diff --git a/src/order/OrderEditor.js b/src/order/OrderEditor.js
index 6217c6828d2dd459f13762fe440296e0ae360a34..d08f29fd37bda8da5dd7094deed1b960c077412e 100644
--- a/src/order/OrderEditor.js
+++ b/src/order/OrderEditor.js
@@ -36,7 +36,7 @@ function OrderEditor(props) {
     props.order ? props.order.description : ""
   );
   const [deadline, _setDeadline] = useState(
-    props.order ? new Date(props.order.deadline) : daysAfterNow(3)
+    props.order ? props.order.deadline : date2string(daysAfterNow(3))
   );
   const [picks, _setPicks] = useState(
     props.order ? order2picks(props.order) : []
@@ -54,8 +54,8 @@ function OrderEditor(props) {
     props.onChange(body);
   };
   const setDeadline = (str) => {
+    _setDeadline(str);
     const deadline = new Date(str);
-    _setDeadline(deadline);
     const body = genBody(name, description, deadline, picks);
     props.onChange(body);
   };
@@ -140,7 +140,7 @@ function OrderEditor(props) {
         <Col sm={9}>
           <Form.Control
             type="date"
-            value={date2string(deadline)}
+            value={deadline}
             onChange={(e) => setDeadline(e.target.value)}
             min={date2string(daysAfterNow(1))}
           />