Fix move/resize key conflict