diff --git a/iOS/moti/moti/Design/Sources/Design/CaptureButton.swift b/iOS/moti/moti/Design/Sources/Design/CaptureButton.swift
index 2d72096f..ad27409e 100644
--- a/iOS/moti/moti/Design/Sources/Design/CaptureButton.swift
+++ b/iOS/moti/moti/Design/Sources/Design/CaptureButton.swift
@@ -24,6 +24,9 @@ public final class CaptureButton: UIButton {
         
         setupUI()
         addTarget()
+        
+        let size = min(Self.defaultSize, Self.defaultSize)
+        applyCorenrRadius(size: size)
     }
     
     required init?(coder: NSCoder) {
@@ -36,13 +39,6 @@ public final class CaptureButton: UIButton {
         addTarget(self, action: #selector(captureButtonTouchUpOutside), for: .touchUpOutside)
     }
     
-    public override func layoutSubviews() {
-        super.layoutSubviews()
-        
-        let size = min(frame.width, frame.height)
-        applyCorenrRadius(size: size)
-    }
-    
     // MARK: - Setup
     private func setupUI() {
         backgroundColor = .motiBackground
diff --git a/iOS/moti/moti/Presentation/Sources/Presentation/EditAchievement/EditAchievementViewController.swift b/iOS/moti/moti/Presentation/Sources/Presentation/EditAchievement/EditAchievementViewController.swift
index b23545a2..52efa9f1 100644
--- a/iOS/moti/moti/Presentation/Sources/Presentation/EditAchievement/EditAchievementViewController.swift
+++ b/iOS/moti/moti/Presentation/Sources/Presentation/EditAchievement/EditAchievementViewController.swift
@@ -178,8 +178,6 @@ extension EditAchievementViewController: UIPickerViewDataSource {
 private extension EditAchievementViewController {
     func setupNavigationBar() {
         navigationItem.rightBarButtonItems = [doneButton]
-        doneButton.isEnabled = false
-        doneButton.title = "로딩 중"
     }
     
     func showDoneButton() {
@@ -276,7 +274,8 @@ private extension EditAchievementViewController {
                 guard let self else { return }
                 print("Save Image: \(state)")
                 switch state {
-                case .none, .loading:
+                case .none: break
+                case .loading:
                     doneButton.isEnabled = false
                     doneButton.title = "로딩 중"
                 case .finish: