diff --git a/server.py b/server.py
index 32a11e8..4ea67bc 100644
--- a/server.py
+++ b/server.py
@@ -83,17 +83,21 @@ def edit(id):
     return render_template('edit.html', item=cursor.fetchone())
 
 @app.post('/<id>/move')
-@app.post('/move')
-def move(id=None):
-    if request.args.get('_method') == 'PUT':
-        cursor.execute('UPDATE items SET parent_id = %s WHERE id = %s LIMIT 1', [id if id else None, request.cookies.get('movingItemId')])
+def move(id):
+    if 'parent_id' in request.form:
+        response = make_response(redirect('/'+request.form['parent_id']))
+    else:
+        response = make_response(redirect('/'))
+    response.set_cookie('movingItemId', id)
+    return response
+
+@app.put('/<id>/move')
+@app.put('/move')
+def updateParentId(id=None):
+    cursor.execute('UPDATE items SET parent_id = %s WHERE id = %s LIMIT 1', [id, request.cookies.get('movingItemId')])
+    if id:
         response = make_response(redirect('/' + id))
-        response.set_cookie('movingItemId', '', expires = 0)
-        return response
     else:
-        if 'parent_id' in request.form:
-            response = make_response(redirect('/'+request.form['parent_id']))
-        else:
-            response = make_response(redirect('/'))
-        response.set_cookie('movingItemId', id)
-        return response
+        response = make_response(redirect('/'))
+    response.set_cookie('movingItemId', '', expires = 0)
+    return response