diff --git a/frontend/src/Artist/Edit/EditArtistModalContent.js b/frontend/src/Artist/Edit/EditArtistModalContent.js
index c919aec88..82a390d84 100644
--- a/frontend/src/Artist/Edit/EditArtistModalContent.js
+++ b/frontend/src/Artist/Edit/EditArtistModalContent.js
@@ -35,6 +35,10 @@ class EditArtistModalContent extends Component {
   //
   // Listeners
 
+  onCancelPress = () => {
+    this.setState({ isConfirmMoveModalOpen: false });
+  };
+
   onSavePress = () => {
     const {
       isPathChanging,
@@ -226,6 +230,7 @@ class EditArtistModalContent extends Component {
           originalPath={originalPath}
           destinationPath={path.value}
           isOpen={this.state.isConfirmMoveModalOpen}
+          onModalClose={this.onCancelPress}
           onSavePress={this.onSavePress}
           onMoveArtistPress={this.onMoveArtistPress}
         />
diff --git a/frontend/src/Artist/Index/Select/Edit/EditArtistModalContent.tsx b/frontend/src/Artist/Index/Select/Edit/EditArtistModalContent.tsx
index 6d3ab132b..a47602b48 100644
--- a/frontend/src/Artist/Index/Select/Edit/EditArtistModalContent.tsx
+++ b/frontend/src/Artist/Index/Select/Edit/EditArtistModalContent.tsx
@@ -135,6 +135,10 @@ function EditArtistModalContent(props: EditArtistModalContentProps) {
     }
   }, [rootFolderPath, save]);
 
+  const onCancelPress = useCallback(() => {
+    setIsConfirmMoveModalOpen(false);
+  }, [setIsConfirmMoveModalOpen]);
+
   const onDoNotMoveArtistPress = useCallback(() => {
     setIsConfirmMoveModalOpen(false);
     save(false);
@@ -223,6 +227,7 @@ function EditArtistModalContent(props: EditArtistModalContentProps) {
       <MoveArtistModal
         isOpen={isConfirmMoveModalOpen}
         destinationRootFolder={rootFolderPath}
+        onModalClose={onCancelPress}
         onSavePress={onDoNotMoveArtistPress}
         onMoveArtistPress={onMoveArtistPress}
       />
diff --git a/frontend/src/Artist/MoveArtist/MoveArtistModal.js b/frontend/src/Artist/MoveArtist/MoveArtistModal.js
index 9d6e54c81..1bad51151 100644
--- a/frontend/src/Artist/MoveArtist/MoveArtistModal.js
+++ b/frontend/src/Artist/MoveArtist/MoveArtistModal.js
@@ -15,6 +15,7 @@ function MoveArtistModal(props) {
     destinationPath,
     destinationRootFolder,
     isOpen,
+    onModalClose,
     onSavePress,
     onMoveArtistPress
   } = props;
@@ -33,11 +34,11 @@ function MoveArtistModal(props) {
       isOpen={isOpen}
       size={sizes.MEDIUM}
       closeOnBackgroundClick={false}
-      onModalClose={onSavePress}
+      onModalClose={onModalClose}
     >
       <ModalContent
         showCloseButton={true}
-        onModalClose={onSavePress}
+        onModalClose={onModalClose}
       >
         <ModalHeader>
           Move Files
@@ -76,6 +77,7 @@ MoveArtistModal.propTypes = {
   destinationPath: PropTypes.string,
   destinationRootFolder: PropTypes.string,
   isOpen: PropTypes.bool.isRequired,
+  onModalClose: PropTypes.func.isRequired,
   onSavePress: PropTypes.func.isRequired,
   onMoveArtistPress: PropTypes.func.isRequired
 };