diff --git a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
index 62a440ff4..c3ef4a784 100644
--- a/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
+++ b/app/src/main/java/fr/free/nrw/commons/customselector/ui/adapter/ImageAdapter.kt
@@ -168,8 +168,7 @@ class ImageAdapter(
 
                     // Getting selected index when switch is off
                 } else if (actionableImagesMap.size > position) {
-                    ImageHelper
-                        .getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])
+                    ImageHelper.getIndex(selectedImages, ArrayList(actionableImagesMap.values)[position])
 
                     // For any other case return -1
                 } else {
@@ -348,8 +347,14 @@ class ImageAdapter(
                 numberOfSelectedImagesMarkedAsNotForUpload--
             }
             notifyItemChanged(position, ImageUnselected())
+            // Notify listener of deselection to update UI
+            imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
         } else {
-            val image = images[position]
+            // Prevent adding the same image multiple times
+            val image = if (showAlreadyActionedImages) images[position] else ArrayList(actionableImagesMap.values)[position]
+            if (selectedImages.contains(image)) {
+                return // Image already selected, ignore additional clicks
+            }
             scope.launch(ioDispatcher) {
                 val imageSHA1 = imageLoader.getSHA1(image, defaultDispatcher)
                 withContext(Dispatchers.Main) {
@@ -373,7 +378,6 @@ class ImageAdapter(
                     }
                     selectedImages.add(image)
                     notifyItemChanged(position, ImageSelectedOrUpdated())
-
                     imageSelectListener.onSelectedImagesChanged(selectedImages, numberOfSelectedImagesMarkedAsNotForUpload)
                 }
             }
@@ -632,4 +636,4 @@ class ImageAdapter(
     fun setSingleSelection(single: Boolean) {
         singleSelection = single
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/values-kge/error.xml b/app/src/main/res/values-kge/error.xml
new file mode 100644
index 000000000..f2f30519a
--- /dev/null
+++ b/app/src/main/res/values-kge/error.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Authors:
+* Es Krim 5 Juta Rasa
+-->
+<resources>
+  <string name="crash_dialog_title">Commons cadang ngojut</string>
+  <string name="crash_dialog_text">Ay uy. Uwat say mak bonos!</string>
+  <string name="crash_dialog_comment_prompt">Unjuk panday sikam apiya say Niku gawiko, raduna kirimko jak surel. Informasimu nulung sikam nandanina!</string>
+  <string name="crash_dialog_ok_toast">Tarima kasih!</string>
+</resources>