diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsView.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsView.swift
index b58c8ac8ce..fc7fdb0533 100644
--- a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsView.swift
+++ b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsView.swift
@@ -53,7 +53,11 @@ final class StepQuizTableSelectColumnsView: UIView {
         }
     }
 
-    var isMultipleChoice = false
+    var isMultipleChoice = false {
+        didSet {
+            confirmButtonContainerView.isHidden = !isMultipleChoice
+        }
+    }
 
     init(
         frame: CGRect = .zero,
diff --git a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsViewController.swift b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsViewController.swift
index 9cc9e3389e..c7c6e31949 100644
--- a/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsViewController.swift
+++ b/iosHyperskillApp/iosHyperskillApp/Sources/Modules/StepQuizSubmodules/StepQuizTableSelectColumns/StepQuizTableSelectColumnsViewController.swift
@@ -3,7 +3,8 @@ import UIKit
 
 extension StepQuizTableSelectColumnsViewController {
     enum Animation {
-        static let dismissAnimationDelay: TimeInterval = 0.33
+        static let dismissAnimationDelayAfterDidTapConfirm: TimeInterval = 0.33
+        static let dismissAnimationDelayAfterChoiceSelected: TimeInterval = 0.5
     }
 }
 
@@ -83,14 +84,14 @@ extension StepQuizTableSelectColumnsViewController: StepQuizTableSelectColumnsVi
         }
 
         tableQuizSelectColumnsView?.update(selectedColumnsIDs: selectedColumnsIDs)
+
+        if !isMultipleChoice {
+            confirmSelection(delay: Animation.dismissAnimationDelayAfterChoiceSelected)
+        }
     }
 
     func tableQuizSelectColumnsViewDidTapConfirm(_ view: StepQuizTableSelectColumnsView) {
-        onColumnsSelected(selectedColumnsIDs)
-
-        DispatchQueue.main.asyncAfter(deadline: .now() + Animation.dismissAnimationDelay) {
-            self.dismiss(animated: true)
-        }
+        confirmSelection(delay: Animation.dismissAnimationDelayAfterDidTapConfirm)
     }
 
     func tableQuizSelectColumnsViewDidLoadContent(_ view: StepQuizTableSelectColumnsView) {
@@ -99,4 +100,12 @@ extension StepQuizTableSelectColumnsViewController: StepQuizTableSelectColumnsVi
             self.panModalTransition(to: .longForm)
         }
     }
+
+    private func confirmSelection(delay: TimeInterval) {
+        onColumnsSelected(selectedColumnsIDs)
+
+        DispatchQueue.main.asyncAfter(deadline: .now() + delay) {
+            self.dismiss(animated: true)
+        }
+    }
 }