diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt
index 0f4681c8..b2cfc74e 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/database/dao/DownloadDao.kt
@@ -19,6 +19,9 @@ interface DownloadDao {
     @Query("SELECT * FROM downloads WHERE status='Active'")
     fun getActiveDownloadsList() : List<DownloadItem>
 
+    @Query("SELECT * FROM downloads WHERE status='Active' or status='Queued'")
+    fun getActiveAndQueuedDownloadsList() : List<DownloadItem>
+
     @Query("SELECT * FROM downloads WHERE status='Queued' ORDER BY downloadStartTime, id")
     fun getQueuedDownloads() : LiveData<List<DownloadItem>>
 
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt
index 5cab3019..fd43898f 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/database/repository/DownloadRepository.kt
@@ -49,6 +49,10 @@ class DownloadRepository(private val downloadDao: DownloadDao) {
         return downloadDao.getActiveDownloadsList()
     }
 
+    fun getActiveAndQueuedDownloads() : List<DownloadItem> {
+        return downloadDao.getActiveAndQueuedDownloadsList()
+    }
+
     suspend fun deleteCancelled(){
         downloadDao.deleteCancelled()
     }
@@ -61,9 +65,6 @@ class DownloadRepository(private val downloadDao: DownloadDao) {
         downloadDao.cancelQueued()
     }
 
-    fun checkIfPresentForProcessing(item: ResultItem): DownloadItem{
-        return downloadDao.checkIfErrorOrCancelled(item.url)
-    }
 
     fun checkIfReDownloadingErroredOrCancelled(item: DownloadItem) : Long {
         val converters = Converters()
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt
index b68d1883..2a2c58b5 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt
@@ -354,14 +354,33 @@ class DownloadViewModel(private val application: Application) : AndroidViewModel
         return repository.getActiveDownloads()
     }
 
+    fun getActiveAndQueuedDownloads() : List<DownloadItem>{
+        return repository.getActiveAndQueuedDownloads()
+    }
+
     suspend fun queueDownloads(items: List<DownloadItem>) {
         val context = getApplication<App>().applicationContext
+        val activeAndQueuedDownloads = withContext(Dispatchers.IO){
+            repository.getActiveAndQueuedDownloads()
+        }
         val allowMeteredNetworks = sharedPreferences.getBoolean("metered_networks", true)
-        items.forEach { it.status = DownloadRepository.Status.Queued.toString() }
-        val ids = repository.insertAll(items)
-        for (i in ids.indices){
-            val it = items[i]
-            it.id = ids[i]
+        val queuedItems = mutableListOf<DownloadItem>()
+        items.forEach {
+            it.status = DownloadRepository.Status.Queued.toString()
+            if (activeAndQueuedDownloads.firstOrNull{d ->
+                    d.id = 0
+                    d.status = DownloadRepository.Status.Queued.toString()
+                    d.toString() == it.toString()
+            } != null) {
+                Toast.makeText(context, context.getString(R.string.download_already_exists), Toast.LENGTH_LONG).show()
+            }else{
+                it.id = withContext(Dispatchers.IO){
+                    repository.insert(it)
+                }
+                queuedItems.add(it)
+            }
+        }
+        queuedItems.forEach {
             val currentTime = System.currentTimeMillis()
             var delay = if (it.downloadStartTime != 0L){
                 it.downloadStartTime - currentTime
@@ -383,8 +402,7 @@ class DownloadViewModel(private val application: Application) : AndroidViewModel
                 ExistingWorkPolicy.KEEP,
                 workRequest
             ).enqueue()
-        }
-        items.forEach {
+
             it.id = withContext(Dispatchers.IO){
                 repository.checkIfReDownloadingErroredOrCancelled(it)
             }
@@ -392,6 +410,7 @@ class DownloadViewModel(private val application: Application) : AndroidViewModel
                 repository.delete(it)
             }
         }
+
         val isCurrentNetworkMetered = (context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager).isActiveNetworkMetered
         if (!allowMeteredNetworks && isCurrentNetworkMetered){
             Toast.makeText(context, context.getString(R.string.metered_network_download_start_info), Toast.LENGTH_LONG).show()
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
index f08f7072..13278ab4 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadBottomSheetDialog.kt
@@ -154,7 +154,12 @@ class DownloadBottomSheetDialog(private val resultItem: ResultItem, private val
         viewPager2.setPageTransformer(BackgroundToForegroundPageTransformer())
 
         val scheduleBtn = view.findViewById<MaterialButton>(R.id.bottomsheet_schedule_button)
+        val download = view.findViewById<Button>(R.id.bottomsheet_download_button)
+
+
         scheduleBtn.setOnClickListener{
+            scheduleBtn.isEnabled = false
+            download.isEnabled = false
             uiUtil.showDatePicker(fragmentManager) {
                 val item: DownloadItem = getDownloadItem();
                 item.downloadStartTime = it.timeInMillis
@@ -166,8 +171,9 @@ class DownloadBottomSheetDialog(private val resultItem: ResultItem, private val
                 dismiss()
             }
         }
-        val download = view.findViewById<Button>(R.id.bottomsheet_download_button)
         download!!.setOnClickListener {
+            scheduleBtn.isEnabled = false
+            download.isEnabled = false
             val item: DownloadItem = getDownloadItem();
             runBlocking {
                 downloadViewModel.queueDownloads(listOf(item))
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
index d38b228c..cfc511fd 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloadcard/DownloadMultipleBottomSheetDialog.kt
@@ -102,7 +102,12 @@ class DownloadMultipleBottomSheetDialog(private var results: List<ResultItem?>,
         listAdapter.submitList(items.toList())
 
         val scheduleBtn = view.findViewById<MaterialButton>(R.id.bottomsheet_schedule_button)
+        val download = view.findViewById<Button>(R.id.bottomsheet_download_button)
+
+
         scheduleBtn.setOnClickListener{
+            scheduleBtn.isEnabled = false
+            download.isEnabled = false
             uiUtil.showDatePicker(parentFragmentManager) {
                 items.forEach { item ->
                     item.downloadStartTime = it.timeInMillis
@@ -117,8 +122,9 @@ class DownloadMultipleBottomSheetDialog(private var results: List<ResultItem?>,
             }
         }
 
-        val download = view.findViewById<Button>(R.id.bottomsheet_download_button)
         download!!.setOnClickListener {
+            scheduleBtn.isEnabled = false
+            download.isEnabled = false
             runBlocking {
                 downloadViewModel.queueDownloads(items)
             }
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt
index 23e7ceee..87d09eec 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/DownloadQueueActivity.kt
@@ -14,6 +14,7 @@ import androidx.viewpager2.widget.ViewPager2
 import androidx.work.WorkManager
 import androidx.work.await
 import com.deniscerri.ytdlnis.R
+import com.deniscerri.ytdlnis.database.repository.DownloadRepository
 import com.deniscerri.ytdlnis.database.viewmodel.DownloadViewModel
 import com.deniscerri.ytdlnis.ui.BaseActivity
 import com.deniscerri.ytdlnis.util.NotificationUtil
@@ -126,19 +127,19 @@ class DownloadQueueActivity : BaseActivity(){
     }
 
     private fun cancelAllDownloads() {
+        workManager.cancelAllWorkByTag("download")
         lifecycleScope.launch {
             val notificationUtil = NotificationUtil(this@DownloadQueueActivity)
-            val activeDownloads = withContext(Dispatchers.IO){
-                downloadViewModel.getActiveDownloads()
+            val activeAndQueued = withContext(Dispatchers.IO){
+                downloadViewModel.getActiveAndQueuedDownloads()
             }
-            val workManager = WorkManager.getInstance(this@DownloadQueueActivity)
-            activeDownloads.forEach {
+            activeAndQueued.forEach {
+                it.status = DownloadRepository.Status.Cancelled.toString()
+                downloadViewModel.updateDownload(it)
                 val id = it.id.toInt()
                 YoutubeDL.getInstance().destroyProcessById(id.toString())
-                workManager.cancelUniqueWork(id.toString())
                 notificationUtil.cancelDownloadNotification(id)
             }
-            workManager.cancelAllWorkByTag("download")
         }
     }
 
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
index 80a9be98..70138107 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/ErroredDownloadsFragment.kt
@@ -229,7 +229,7 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL
     }
 
     private var simpleCallback: ItemTouchHelper.SimpleCallback =
-        object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
+        object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT or ItemTouchHelper.RIGHT) {
             override fun onMove(recyclerView: RecyclerView,viewHolder: RecyclerView.ViewHolder,target: RecyclerView.ViewHolder
             ): Boolean {
                 return false
@@ -238,6 +238,11 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL
             override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
                 val position = viewHolder.bindingAdapterPosition
                 when (direction) {
+                    ItemTouchHelper.RIGHT -> {
+                        runBlocking{
+                            downloadViewModel.queueDownloads(listOf(items[position]))
+                        }
+                    }
                     ItemTouchHelper.LEFT -> {
                         val deletedItem = items[position]
                         downloadViewModel.deleteDownload(deletedItem)
@@ -277,6 +282,7 @@ class ErroredDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickL
                             R.attr.colorOnSurfaceInverse, Color.TRANSPARENT
                         )
                     )
+                    .addSwipeRightActionIcon(R.drawable.ic_refresh)
                     .create()
                     .decorate()
                 super.onChildDraw(
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
index 5007cb18..3dff5a24 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/ui/downloads/QueuedDownloadsFragment.kt
@@ -1,6 +1,7 @@
 package com.deniscerri.ytdlnis.ui.downloads
 
 import android.app.Activity
+import android.content.DialogInterface
 import android.content.res.Configuration
 import android.graphics.Canvas
 import android.graphics.Color
@@ -35,6 +36,7 @@ import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.chip.Chip
 import com.google.android.material.color.MaterialColors
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
 import com.yausername.youtubedl_android.YoutubeDL
 import it.xabaras.android.recyclerview.swipedecorator.RecyclerViewSwipeDecorator
@@ -111,7 +113,7 @@ class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLi
                 downloadViewModel.deleteDownload(downloadViewModel.getItemByID(itemID))
             }
         }
-        cancelDownload(itemID)
+        removeItem(itemID)
     }
 
     override fun onCardClick(itemID: Long) {
@@ -206,7 +208,8 @@ class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLi
         val remove = bottomSheet.findViewById<Button>(R.id.bottomsheet_remove_button)
         remove!!.tag = itemID
         remove.setOnClickListener{
-            cancelDownload(itemID)
+            bottomSheet.hide()
+            removeItem(itemID)
         }
         val openFile = bottomSheet.findViewById<Button>(R.id.bottomsheet_open_file_button)
         openFile!!.visibility = View.GONE
@@ -238,11 +241,19 @@ class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLi
         )
     }
 
-    private fun cancelDownload(itemID: Long){
-        val id = itemID.toInt()
-        YoutubeDL.getInstance().destroyProcessById(id.toString())
-        WorkManager.getInstance(requireContext()).cancelUniqueWork(id.toString())
-        notificationUtil.cancelDownloadNotification(id)
+    private fun removeItem(itemID: Long){
+        val item = items.find { it.id == itemID }
+        val deleteDialog = MaterialAlertDialogBuilder(requireContext())
+        deleteDialog.setTitle(getString(R.string.you_are_going_to_delete) + " \"" + item?.title + "\"!")
+        deleteDialog.setNegativeButton(getString(R.string.cancel)) { dialogInterface: DialogInterface, _: Int -> dialogInterface.cancel() }
+        deleteDialog.setPositiveButton(getString(R.string.ok)) { _: DialogInterface?, _: Int ->
+            val id = itemID.toInt()
+            YoutubeDL.getInstance().destroyProcessById(id.toString())
+            WorkManager.getInstance(requireContext()).cancelUniqueWork(id.toString())
+            notificationUtil.cancelDownloadNotification(id)
+            downloadViewModel.deleteDownload(item!!)
+        }
+        deleteDialog.show()
     }
 
     private var simpleCallback: ItemTouchHelper.SimpleCallback =
@@ -257,7 +268,7 @@ class QueuedDownloadsFragment : Fragment(), GenericDownloadAdapter.OnItemClickLi
                 when (direction) {
                     ItemTouchHelper.LEFT -> {
                         val deletedItem = items[position]
-                        cancelDownload(deletedItem.id)
+                        removeItem(deletedItem.id)
                         Snackbar.make(queuedRecyclerView, getString(R.string.cancelled) + ": " + deletedItem.title, Snackbar.LENGTH_LONG)
                             .setAction(getString(R.string.undo)) {
                                 lifecycleScope.launch(Dispatchers.IO) {
diff --git a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
index 39c701d7..aff8d1c0 100644
--- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
+++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt
@@ -55,6 +55,7 @@ class DownloadWorker(
             e.printStackTrace()
             return Result.failure()
         }
+        if (downloadItem.status != DownloadRepository.Status.Queued.toString()) return Result.failure()
 
         Log.e(TAG, downloadItem.toString())
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d8fd43b7..e77fdcc2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -246,4 +246,5 @@
     <string name="remove_audio">Remove Audio</string>
     <string name="preferred_format_id">Preferred Format ID</string>
     <string name="download_now">Download Now</string>
+    <string name="download_already_exists">Download already exists</string>
 </resources>
\ No newline at end of file