diff --git a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift
index 83860046e..c49dcc1a1 100644
--- a/Mastodon/Scene/Root/MainTab/MainTabBarController.swift
+++ b/Mastodon/Scene/Root/MainTab/MainTabBarController.swift
@@ -36,6 +36,7 @@ class MainTabBarController: UITabBarController {
         button.layer.masksToBounds = true
         button.layer.cornerCurve = .continuous
         button.layer.cornerRadius = 8
+        button.isAccessibilityElement = false
         return button
     }()
     
@@ -200,14 +201,6 @@ extension MainTabBarController {
             viewController.tabBarItem.largeContentSizeImage = tab.largeImage.imageWithoutBaseline()
             viewController.tabBarItem.accessibilityLabel = tab.title
             viewController.tabBarItem.imageInsets = UIEdgeInsets(top: 6, left: 0, bottom: -6, right: 0)
-            
-            switch tab {
-            case .compose:
-                viewController.tabBarItem.isEnabled = false
-            default:
-                break
-            }
-            
             return viewController
         }
         _viewControllers = viewControllers
@@ -367,7 +360,7 @@ extension MainTabBarController {
 
 extension MainTabBarController {
     
-    @objc private func composeButtonDidPressed(_ sender: UIButton) {
+    @objc private func composeButtonDidPressed(_ sender: Any) {
         logger.log(level: .debug, "\((#file as NSString).lastPathComponent, privacy: .public)[\(#line, privacy: .public)], \(#function, privacy: .public)")
         guard let authContext = self.authContext else { return }
         let composeViewModel = ComposeViewModel(
@@ -510,6 +503,14 @@ extension MainTabBarController {
 
 // MARK: - UITabBarControllerDelegate
 extension MainTabBarController: UITabBarControllerDelegate {
+    func tabBarController(_ tabBarController: UITabBarController, shouldSelect viewController: UIViewController) -> Bool {
+        if let tab = Tab(rawValue: viewController.tabBarItem.tag), tab == .compose {
+            composeButtonDidPressed(tabBarController)
+            return false
+        }
+        return true
+    }
+
     func tabBarController(_ tabBarController: UITabBarController, didSelect viewController: UIViewController) {
         os_log(.info, log: .debug, "%{public}s[%{public}ld], %{public}s: select %s", ((#file as NSString).lastPathComponent), #line, #function, viewController.debugDescription)
         defer {