diff --git a/src/Client/Shared/Components/Modal/ArtifactDetailModal/ArtifactDetailModal.razor.cs b/src/Client/Shared/Components/Modal/ArtifactDetailModal/ArtifactDetailModal.razor.cs
index c07344292..f63623a31 100644
--- a/src/Client/Shared/Components/Modal/ArtifactDetailModal/ArtifactDetailModal.razor.cs
+++ b/src/Client/Shared/Components/Modal/ArtifactDetailModal/ArtifactDetailModal.razor.cs
@@ -29,7 +29,7 @@ public void Download()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Move()
@@ -40,7 +40,7 @@ public void Move()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Pin()
@@ -51,7 +51,7 @@ public void Pin()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Unpin()
@@ -62,7 +62,7 @@ public void Unpin()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void More()
@@ -73,7 +73,7 @@ public void More()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void ChangeArtifactSlideItem(bool isNext)
diff --git a/src/Client/Shared/Components/Modal/ArtifactOverflowModal/ArtifactOverflowModal.razor.cs b/src/Client/Shared/Components/Modal/ArtifactOverflowModal/ArtifactOverflowModal.razor.cs
index 018b5a9a7..31150a292 100644
--- a/src/Client/Shared/Components/Modal/ArtifactOverflowModal/ArtifactOverflowModal.razor.cs
+++ b/src/Client/Shared/Components/Modal/ArtifactOverflowModal/ArtifactOverflowModal.razor.cs
@@ -18,6 +18,7 @@ public void Details()
 
             _tcs?.SetResult(result);
             _tcs = null;
+            Close();
         }
 
         public void Extract()
@@ -28,7 +29,7 @@ public void Extract()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void OpenWith()
@@ -39,7 +40,7 @@ public void OpenWith()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Rename()
@@ -50,7 +51,7 @@ public void Rename()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Copy()
@@ -61,7 +62,7 @@ public void Copy()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Pin()
@@ -72,7 +73,7 @@ public void Pin()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void UnPin()
@@ -83,7 +84,7 @@ public void UnPin()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Move()
@@ -94,7 +95,7 @@ public void Move()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void ShareWithApp()
@@ -105,7 +106,7 @@ public void ShareWithApp()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void ShowInLocation()
@@ -116,7 +117,7 @@ public void ShowInLocation()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public void Delete()
@@ -127,7 +128,7 @@ public void Delete()
             _tcs?.SetResult(result);
             _tcs = null;
 
-            _isModalOpen = false;
+            Close();
         }
 
         public async Task<ArtifactOverflowResult> ShowAsync