diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt
index c9018cb22..8426bd8c4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt
@@ -39,6 +39,7 @@ class SettingsActivity : SimpleActivity() {
         setupManageHiddenFolders()
         setupShowHiddenItems()
         setupDoExtraCheck()
+        setupAutoplayVideos()
         setupRememberLastVideo()
         setupLoopVideos()
         setupAnimateGifs()
@@ -148,6 +149,14 @@ class SettingsActivity : SimpleActivity() {
         }
     }
 
+    private fun setupAutoplayVideos() {
+        settings_autoplay_videos.isChecked = config.autoplayVideos
+        settings_autoplay_videos_holder.setOnClickListener {
+            settings_autoplay_videos.toggle()
+            config.autoplayVideos = settings_autoplay_videos.isChecked
+        }
+    }
+
     private fun setupRememberLastVideo() {
         settings_remember_last_video_position.isChecked = config.rememberLastVideoPosition
         settings_remember_last_video_position_holder.setOnClickListener {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt
index a36fe8b1b..405181b18 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Config.kt
@@ -152,6 +152,10 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getStringSet(INCLUDED_FOLDERS, HashSet<String>())
         set(includedFolders) = prefs.edit().remove(INCLUDED_FOLDERS).putStringSet(INCLUDED_FOLDERS, includedFolders).apply()
 
+    var autoplayVideos: Boolean
+        get() = prefs.getBoolean(AUTOPLAY_VIDEOS, false)
+        set(autoplay) = prefs.edit().putBoolean(AUTOPLAY_VIDEOS, autoplay).apply()
+
     var animateGifs: Boolean
         get() = prefs.getBoolean(ANIMATE_GIFS, false)
         set(animateGifs) = prefs.edit().putBoolean(ANIMATE_GIFS, animateGifs).apply()
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt
index b455298ad..16e61ddc8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/Constants.kt
@@ -10,6 +10,7 @@ const val VIEW_TYPE_PREFIX = "view_type_folder_"
 const val SHOW_HIDDEN_MEDIA = "show_hidden_media"
 const val TEMPORARILY_SHOW_HIDDEN = "temporarily_show_hidden"
 const val IS_THIRD_PARTY_INTENT = "is_third_party_intent"
+const val AUTOPLAY_VIDEOS = "autoplay_videos"
 const val REMEMBER_LAST_VIDEO_POSITION = "remember_last_video_position"
 const val LOOP_VIDEOS = "loop_videos"
 const val ANIMATE_GIFS = "animate_gifs"
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index fcf352d62..75d86d798 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -208,6 +208,30 @@
             android:textAllCaps="true"
             android:textSize="@dimen/smaller_text_size"/>
 
+        <RelativeLayout
+            android:id="@+id/settings_autoplay_videos_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:paddingLeft="@dimen/normal_margin"
+            android:paddingTop="@dimen/activity_margin"
+            android:paddingRight="@dimen/normal_margin"
+            android:paddingBottom="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_autoplay_videos"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingStart="@dimen/medium_margin"
+                android:paddingLeft="@dimen/medium_margin"
+                android:text="@string/autoplay_videos"
+                app:switchPadding="@dimen/medium_margin"/>
+
+        </RelativeLayout>
+
         <RelativeLayout
             android:id="@+id/settings_remember_last_video_position_holder"
             android:layout_width="match_parent"