diff --git a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt
index 5ee0d4e75..fcd0ac583 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt
+++ b/app/src/main/java/com/itsaky/androidide/fragments/onboarding/IdeSetupConfigurationFragment.kt
@@ -127,9 +127,6 @@ class IdeSetupConfigurationFragment : OnboardingFragment(), SlidePolicy {
     args.setArgument(IdeSetupArgument.JDK_VERSION,
       JdkVersion.fromDisplayName(content.jdkVersion.text).version)
     args.setArgument(IdeSetupArgument.ASSUME_YES)
-    if (content.withCmdlineTools.isChecked) {
-      args.setArgument(IdeSetupArgument.WITH_CMDLINE_TOOLS)
-    }
     if (content.installGit.isChecked) {
       args.setArgument(IdeSetupArgument.WITH_GIT)
     }
diff --git a/app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt b/app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt
index 2d266d0b1..646713717 100644
--- a/app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt
+++ b/app/src/main/java/com/itsaky/androidide/models/IdeSetupArguments.kt
@@ -26,7 +26,6 @@ package com.itsaky.androidide.models
  */
 enum class IdeSetupArgument(val argumentName: String, val requiresValue: Boolean = false) {
   INSTALL_DIR("--install-dir", true),
-  WITH_CMDLINE_TOOLS("--with-cmdline-tools"),
   WITH_GIT("--with-git"),
   ASSUME_YES("--assume-yes"),
   WITH_OPENSSH("--with-openssh"),
diff --git a/app/src/main/res/layout/layout_onboardng_setup_config.xml b/app/src/main/res/layout/layout_onboardng_setup_config.xml
index 2cecfd2ba..c20feaf21 100644
--- a/app/src/main/res/layout/layout_onboardng_setup_config.xml
+++ b/app/src/main/res/layout/layout_onboardng_setup_config.xml
@@ -15,8 +15,7 @@
   ~   along with AndroidIDE.  If not, see <https://www.gnu.org/licenses/>.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
@@ -68,24 +67,14 @@
   </androidx.appcompat.widget.LinearLayoutCompat>
 
   <com.google.android.material.checkbox.MaterialCheckBox
-    android:id="@+id/with_cmdline_tools"
+    android:id="@+id/install_git"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="16dp"
     android:checked="true"
-    android:enabled="false"
-    android:text="@string/msg_with_command_line_tools"
-    app:layout_constraintStart_toStartOf="@id/auto_install_switch"
-    app:layout_constraintTop_toBottomOf="@id/jdk_version_layout" />
-
-  <com.google.android.material.checkbox.MaterialCheckBox
-    android:id="@+id/install_git"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:checked="true"
     android:text="@string/action_install_git"
     app:layout_constraintStart_toStartOf="@id/auto_install_switch"
-    app:layout_constraintTop_toBottomOf="@id/with_cmdline_tools" />
+    app:layout_constraintTop_toBottomOf="@id/jdk_version_layout" />
 
   <com.google.android.material.checkbox.MaterialCheckBox
     android:id="@+id/install_openssh"
diff --git a/resources/src/main/res/values/strings.xml b/resources/src/main/res/values/strings.xml
index 60e27edae..b31cf8242 100644
--- a/resources/src/main/res/values/strings.xml
+++ b/resources/src/main/res/values/strings.xml
@@ -541,7 +541,6 @@
   <string name="action_manual_install">Manual installation</string>
   <string name="hint_android_sdk_version">Android SDK version</string>
   <string name="hin_jdk_version">JDK version</string>
-  <string name="msg_with_command_line_tools">With command line tools</string>
   <string name="action_install_git">Install Git</string>
   <string name="action_install_openssh">Install OpenSSH</string>
   <string name="msg_terminal_new_sessions_disabled">Cannot create session. New sessions are disabled!</string>
diff --git a/termux/termux-app/src/main/assets/data/common/idesetup.sh b/termux/termux-app/src/main/assets/data/common/idesetup.sh
index 2bd4800f0..ea36436b0 100755
--- a/termux/termux-app/src/main/assets/data/common/idesetup.sh
+++ b/termux/termux-app/src/main/assets/data/common/idesetup.sh
@@ -14,7 +14,7 @@ yes='^[Yy][Ee]?[Ss]?$'
 arch=$(uname -m)
 install_dir=$HOME
 sdkver_org=34.0.4
-with_cmdline=false
+with_cmdline=true
 assume_yes=false
 manifest="https://raw.githubusercontent.com/AndroidIDEOfficial/androidide-tools/main/manifest.json"
 pkgm="pkg"