diff --git a/app/src/main/java/com/itsaky/androidide/fragments/CloneRepositoryFragment.kt b/app/src/main/java/com/itsaky/androidide/fragments/CloneRepositoryFragment.kt
index 6cdf18215f..b462f08995 100644
--- a/app/src/main/java/com/itsaky/androidide/fragments/CloneRepositoryFragment.kt
+++ b/app/src/main/java/com/itsaky/androidide/fragments/CloneRepositoryFragment.kt
@@ -82,12 +82,11 @@ class CloneRepositoryFragment : BaseFragment() {
             }
 
             cloneButton.setOnClickListener {
-                val url = repoUrl.text.toString()
-                val path = localPath.text.toString()
-                val username = if (authCheckbox.isChecked) username.text.toString() else null
-                val password = if (authCheckbox.isChecked) password.text.toString() else null
-
-                viewModel.cloneRepository(url, path, username, password)
+                cloneRepo()
+            }
+            
+            retryButton.setOnClickListener {
+                cloneRepo()
             }
             
             exitButton.setOnClickListener {
@@ -110,6 +109,15 @@ class CloneRepositoryFragment : BaseFragment() {
         }
     }
 
+    private fun FragmentCloneRepositoryBinding.cloneRepo() {
+        val url = repoUrl.text.toString()
+        val path = localPath.text.toString()
+        val mUsername = if (authCheckbox.isChecked) username.text.toString() else null
+        val mPassword = if (authCheckbox.isChecked) password.text.toString() else null
+
+        viewModel.cloneRepository(url, path, mUsername, mPassword)
+    }
+
     private fun observeViewModel() {
         viewLifecycleOwner.lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
@@ -140,14 +148,17 @@ class CloneRepositoryFragment : BaseFragment() {
                         when (state) {
                             is CloneRepoUiState.Idle -> {
                                 cloneButton.isEnabled = state.isCloneButtonEnabled
+                                retryButton.visibility = View.GONE
                                 statusText.text = ""
                             }
                             is CloneRepoUiState.Cloning -> {
                                 cloneButton.isEnabled = false
+                                retryButton.visibility = View.GONE
                                 statusText.text = getString(R.string.cloning_repo)
                             }
                             is CloneRepoUiState.Error -> {
                                 cloneButton.isEnabled = true
+                                retryButton.visibility = View.VISIBLE
                                 val statusMessage = state.errorResId?.let { getString(it) } ?: state.errorMessage
                                 statusText.text = statusMessage
                             }
diff --git a/app/src/main/java/com/itsaky/androidide/viewmodel/CloneRepositoryViewModel.kt b/app/src/main/java/com/itsaky/androidide/viewmodel/CloneRepositoryViewModel.kt
index f6379ddcb7..650652921a 100644
--- a/app/src/main/java/com/itsaky/androidide/viewmodel/CloneRepositoryViewModel.kt
+++ b/app/src/main/java/com/itsaky/androidide/viewmodel/CloneRepositoryViewModel.kt
@@ -4,7 +4,6 @@ import android.app.Application
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.application
 import androidx.lifecycle.viewModelScope
-import com.itsaky.androidide.R
 import com.itsaky.androidide.git.core.GitRepositoryManager
 import com.itsaky.androidide.git.core.models.CloneRepoUiState
 import kotlinx.coroutines.Dispatchers
@@ -16,7 +15,12 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import org.eclipse.jgit.lib.ProgressMonitor
 import org.eclipse.jgit.transport.UsernamePasswordCredentialsProvider
+import org.eclipse.jgit.api.errors.TransportException
+import java.net.UnknownHostException
+import java.io.EOFException
 import java.io.File
+import com.blankj.utilcode.util.NetworkUtils
+import com.itsaky.androidide.resources.R
 
 class CloneRepositoryViewModel(application: Application) : AndroidViewModel(application) {
 
@@ -67,6 +71,17 @@ class CloneRepositoryViewModel(application: Application) : AndroidViewModel(appl
             return
         }
 
+        if (!NetworkUtils.isConnected()) {
+            _uiState.update {
+                CloneRepoUiState.Error(
+                    url = url,
+                    localPath = localPath,
+                    errorResId = R.string.no_internet_connection
+                )
+            }
+            return
+        }
+
         viewModelScope.launch {
             var hasCloned = false
             _uiState.update {
@@ -143,12 +158,28 @@ class CloneRepositoryViewModel(application: Application) : AndroidViewModel(appl
                     CloneRepoUiState.Success(localPath = localPath)
                 }
             } catch (e: Exception) {
-                val errorMessage = e.message ?: application.getString(R.string.unknown_error)
+                // Error handling
+                val isNetworkError = e is TransportException && e.cause is UnknownHostException
+                val isConnectionDrop = e.cause is EOFException || 
+                    e.message?.contains("Unexpected end of stream") == true ||
+                    e.message?.contains("Software caused connection abort") == true
+                
+                val errorResId = when {
+                    isNetworkError -> R.string.no_internet_connection
+                    isConnectionDrop -> R.string.connection_lost
+                    else -> null
+                }
+                
+                val errorMessage = if (errorResId == null) {
+                    e.message ?: application.getString(R.string.unknown_error)
+                } else null
+                
                 _uiState.update {
                     CloneRepoUiState.Error(
                         url = url,
                         localPath = localPath,
-                        errorMessage = application.getString(R.string.clone_failed, errorMessage)
+                        errorResId = errorResId,
+                        errorMessage = errorMessage?.let { application.getString(R.string.clone_failed, it) }
                     )
                 }
             } finally {
diff --git a/app/src/main/res/layout/fragment_clone_repository.xml b/app/src/main/res/layout/fragment_clone_repository.xml
index 8b6b90b732..7b2e9e863a 100644
--- a/app/src/main/res/layout/fragment_clone_repository.xml
+++ b/app/src/main/res/layout/fragment_clone_repository.xml
@@ -1,156 +1,175 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView 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"
-    android:layout_margin="16dp"
     android:background="?attr/colorSurface"
     android:fillViewport="true">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/tv_download_project"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/download_git_project"
-        android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
-        android:transitionName="title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/repoUrlLayout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:hint="@string/repository_url"
-        app:layout_constraintTop_toBottomOf="@id/tv_download_project">
+        android:layout_margin="16dp">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/repoUrl"
-            android:layout_width="match_parent"
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/tv_download_project"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:inputType="textUri" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/localPathLayout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:hint="@string/local_path"
-        app:endIconContentDescription="@string/pick_folder"
-        app:endIconDrawable="@drawable/ic_folder"
-        app:endIconMode="custom"
-        app:layout_constraintTop_toBottomOf="@id/repoUrlLayout">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/localPath"
+            android:text="@string/download_git_project"
+            android:textAppearance="@style/TextAppearance.Material3.TitleLarge"
+            android:transitionName="title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/repoUrlLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="text" />
+            android:layout_marginTop="12dp"
+            android:hint="@string/repository_url"
+            app:layout_constraintTop_toBottomOf="@id/tv_download_project">
 
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/repoUrl"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textUri" />
 
-    <CheckBox
-        android:id="@+id/authCheckbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/use_authentication"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/localPathLayout" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/usernameLayout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:hint="@string/username"
-        app:layout_constraintTop_toBottomOf="@id/authCheckbox">
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/username"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/localPathLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="text" />
+            android:layout_marginTop="16dp"
+            android:hint="@string/local_path"
+            app:endIconContentDescription="@string/pick_folder"
+            app:endIconDrawable="@drawable/ic_folder"
+            app:endIconMode="custom"
+            app:layout_constraintTop_toBottomOf="@id/repoUrlLayout">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/localPath"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <CheckBox
+            android:id="@+id/authCheckbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/use_authentication"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/localPathLayout" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/usernameLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:hint="@string/username"
+            app:layout_constraintTop_toBottomOf="@id/authCheckbox">
 
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/username"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="text" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/passwordLayout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:hint="@string/personal_access_token"
-        app:endIconMode="password_toggle"
-        app:layout_constraintTop_toBottomOf="@id/usernameLayout">
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/password"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/passwordLayout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:inputType="textPassword" />
-
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <androidx.constraintlayout.widget.Group
-        android:id="@+id/authGroup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:constraint_referenced_ids="usernameLayout, passwordLayout" />
+            android:layout_marginTop="16dp"
+            android:hint="@string/personal_access_token"
+            app:endIconMode="password_toggle"
+            app:layout_constraintTop_toBottomOf="@id/usernameLayout">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/password"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:inputType="textPassword" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <androidx.constraintlayout.widget.Group
+            android:id="@+id/authGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:constraint_referenced_ids="usernameLayout, passwordLayout" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/exit_button"
-        style="@style/Widget.Material3.Button.OutlinedButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        app:layout_goneMarginTop="16dp"
-        android:text="@string/exit"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/passwordLayout" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/cloneButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        app:layout_goneMarginTop="16dp"
-        android:enabled="false"
-        android:text="@string/download_project"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/passwordLayout" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:max="100"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/cloneButton" />
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/exit_button"
+            style="@style/Widget.Material3.Button.OutlinedButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:text="@string/exit"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+            app:layout_goneMarginTop="16dp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/retryButton"
+            style="@style/Widget.Material3.Button.TonalButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/retry"
+            android:visibility="gone"
+            app:icon="@drawable/ic_refresh"
+            app:layout_constraintEnd_toStartOf="@id/cloneButton"
+            app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+            app:layout_goneMarginTop="16dp" />
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/cloneButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:enabled="false"
+            android:text="@string/download_project"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/passwordLayout"
+            app:layout_goneMarginTop="16dp" />
+
+        <ProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:max="100"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/cloneButton" />
 
-    <TextView
-        android:id="@+id/progressText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        android:gravity="center"
-        android:visibility="gone"
-        app:layout_constraintTop_toBottomOf="@id/progressBar" />
+        <TextView
+            android:id="@+id/progressText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:gravity="center"
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/progressBar" />
 
-    <TextView
-        android:id="@+id/statusText"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:gravity="center"
-        app:layout_constraintTop_toBottomOf="@id/progressText" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        <TextView
+            android:id="@+id/statusText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="center"
+            app:layout_constraintTop_toBottomOf="@id/progressText" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e728ab5e68..563068d8d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,10 +19,4 @@
     <!--  Required by F-Droid-->
     <string name="app_name" translatable="false">Code on the Go</string>
     <string name="pref_use_simple_local_prompt">Use simplified prompt</string>
-    <string name="desc_file_added">File added</string>
-    <string name="desc_file_modified">File modified</string>
-    <string name="desc_file_deleted">File deleted</string>
-    <string name="desc_file_untracked">File untracked</string>
-    <string name="desc_file_renamed">File renamed</string>
-    <string name="desc_file_conflicted">File conflicted</string>
 </resources>
diff --git a/resources/src/main/res/values/strings.xml b/resources/src/main/res/values/strings.xml
index 5c286cf69e..ce66925024 100644
--- a/resources/src/main/res/values/strings.xml
+++ b/resources/src/main/res/values/strings.xml
@@ -1167,4 +1167,12 @@
     <string name="unable_to_load_diff">Unable to load diff</string>
     <string name="diff_viewer">Diff Viewer</string>
     <string name="diff_loading">Loading Git Diff…</string>
+    <string name="no_internet_connection">No internet connection. Please check your network and try again.</string>
+    <string name="connection_lost">Connection lost during download. Please check your internet connection and try again.</string>
+    <string name="desc_file_added">File added</string>
+    <string name="desc_file_modified">File modified</string>
+    <string name="desc_file_deleted">File deleted</string>
+    <string name="desc_file_untracked">File untracked</string>
+    <string name="desc_file_renamed">File renamed</string>
+    <string name="desc_file_conflicted">Conflicted File</string>
 </resources>