diff --git a/src/controller/comment-picker/remote/remote-comment-picker.tsx b/src/controller/comment-picker/remote/remote-comment-picker.tsx
index a70b1c1..4819677 100644
--- a/src/controller/comment-picker/remote/remote-comment-picker.tsx
+++ b/src/controller/comment-picker/remote/remote-comment-picker.tsx
@@ -69,6 +69,7 @@ const RemoteCommentPicker: FC<Props> = ({ onChange }) => {
         options: {
           filters: [{ name: "xml", extensions: ["xml"] }],
           properties: ["createDirectory"],
+          defaultPath: `${nicoId}.xml`,
         },
       });
       setIsLoading(false);
@@ -104,21 +105,23 @@ const RemoteCommentPicker: FC<Props> = ({ onChange }) => {
         fullWidth={true}
       />
       {metadata && (
-        <CommentOption
-          update={setCommentOption}
-          metadata={metadata.data.comment}
-          postedDate={formatDate(new Date(metadata.data.video.registeredAt))}
-        />
+        <>
+          <CommentOption
+            update={setCommentOption}
+            metadata={metadata.data.comment}
+            postedDate={formatDate(new Date(metadata.data.video.registeredAt))}
+          />
+          <div>
+            <Button
+              variant={"outlined"}
+              onClick={onClick}
+              disabled={!CommentOption || !metadata}
+            >
+              確定
+            </Button>
+          </div>
+        </>
       )}
-      <div>
-        <Button
-          variant={"outlined"}
-          onClick={onClick}
-          disabled={!CommentOption || !metadata}
-        >
-          確定
-        </Button>
-      </div>
     </div>
   );
 };
diff --git a/src/controller/movie-picker/remote/remote-movie-picker.tsx b/src/controller/movie-picker/remote/remote-movie-picker.tsx
index 611b632..2c7bfa8 100644
--- a/src/controller/movie-picker/remote/remote-movie-picker.tsx
+++ b/src/controller/movie-picker/remote/remote-movie-picker.tsx
@@ -94,6 +94,7 @@ const RemoteMoviePicker: FC<Props> = ({ onChange }) => {
         options: {
           filters: [{ name: "mp4", extensions: ["mp4"] }],
           properties: ["createDirectory"],
+          defaultPath: `${nicoId}.mp4`,
         },
       });
       setIsLoading(false);