diff --git a/js/webviewGestures.js b/js/webviewGestures.js
index 97946a12b..99a9b797c 100644
--- a/js/webviewGestures.js
+++ b/js/webviewGestures.js
@@ -1,4 +1,5 @@
 var webviews = require('webviews.js')
+var settings = require('util/settings/settings.js')
 
 var webviewGestures = {
   showBackArrow: function () {
@@ -87,15 +88,17 @@ function resetScrollCounters () {
 }
 
 function onSwipeGestureLowVelocity () {
+  const swipeGesturesDisabled = settings.get('disableSwipeGestures')
+
   //we can't detect scroll position in an iframe, so never trigger a back gesture from it
-  if (isInFrame) {
+  if (isInFrame || swipeGesturesDisabled) {
     return
   }
 
   webviews.callAsync(tabs.getSelected(), 'getZoomFactor', function(err, result) {
     const minScrollDistance = 150 * result;
 
-      if ((leftMouseMove / rightMouseMove > 5) || (rightMouseMove / leftMouseMove > 5)) {
+    if ((leftMouseMove / rightMouseMove > 5) || (rightMouseMove / leftMouseMove > 5)) {
       // swipe to the left to go forward
       if (leftMouseMove - beginningScrollRight > minScrollDistance && Math.abs(horizontalMouseMove / verticalMouseMove) > 3) {
         if (beginningScrollRight < 5) {
diff --git a/localization/languages/ar.json b/localization/languages/ar.json
index 7b103912d..1108142bb 100644
--- a/localization/languages/ar.json
+++ b/localization/languages/ar.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "إستعمل شريط عنوان منفصل",
     "settingsAutoplayToggle": "تفعيل التشغيل التلقائي",
+    "settingsDisableSwipeGestures": "تعطيل الإيماءات 'رجوع' و'تقدم' على لوحة التتبع",
     "settingsOpenTabsInForegroundToggle": "الإنتقال إلى  التبويب الجديد عند فتحه",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "يمكن سكريبت المستخدم من  تغير سلوك المواقع - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">معرفة المزيد</a>."
diff --git a/localization/languages/be.json b/localization/languages/be.json
index fb7871d82..80ae22ed6 100644
--- a/localization/languages/be.json
+++ b/localization/languages/be.json
@@ -165,6 +165,7 @@
       "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Выкарыстоўваць сістэмны загаловак акна",
       "settingsAutoplayToggle": "Уключыць аўтаматычнае прайграванне",
+      "settingsDisableSwipeGestures": "Адключыць жэсты 'Назад' і 'Наперад' на трэкпадзе",
       "settingsOpenTabsInForegroundToggle": "Адкрываць новыя ўкладкі на пярэднім плане",
       "settingsUserscriptsExplanation": {
         "unsafeHTML": "Карыстальнiцкiя скрыпты дазваляюць змяняць паводзіны сайтаў - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">даведацца больш</a>."
diff --git a/localization/languages/bg.json b/localization/languages/bg.json
index 4c7d2f2a0..884218a50 100644
--- a/localization/languages/bg.json
+++ b/localization/languages/bg.json
@@ -165,6 +165,7 @@
     "settingsSeparateTitlebarToggle": "Използване на отделна лента със заглавието",
     "settingsAutoplayToggle": null, //missing translation 
     "settingsOpenTabsInForegroundToggle": "Отваряне на нови раздели на преден план",
+    "settingsDisableGoBackwardAndGoForwardGestures": "Деактивиране на жестове 'Назад' и 'Напред' на тъчпада",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Потребителските скриптове Ви позволяват да промените поведението на уеб сайтове - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">научете повече</a>."
     },
diff --git a/localization/languages/bn.json b/localization/languages/bn.json
index 308de34c6..f6d7c45e9 100644
--- a/localization/languages/bn.json
+++ b/localization/languages/bn.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "পৃথক শিরোনাম বার ব্যবহার করুন",
     "settingsAutoplayToggle": null, //missing translation 
+    "settingsDisableSwipeGestures": "ট্র্যাকপ্যাডে 'পেছনে যাওয়া' এবং 'সামনে যাওয়া' নির্দেশক বন্ধ করুন",
     "settingsOpenTabsInForegroundToggle": "অগ্রভাগে নতুন ট্যাবগুলি খুলুন",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "ব্যবহারকারীর স্ক্রিপ্ট আপনাকে ওয়েবসাইটের আচরণ পরিবর্তন করার অনুমতি দেয় - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\"> আরও শিখুন </a>"
diff --git a/localization/languages/ca.json b/localization/languages/ca.json
index 4ded1a8ee..5fc7e6081 100644
--- a/localization/languages/ca.json
+++ b/localization/languages/ca.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Utilitzar barra de títol separada",
     "settingsAutoplayToggle": "Habilitar Reproducció Automàtica",
+    "settingsDisableSwipeGestures": "Desactiva els gestos del trackpad de 'Anar enrere' i 'Anar endavant'",
     "settingsOpenTabsInForegroundToggle": "Obrir noves pestanyes al primer pla",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Els scripts d'usuari et permeten modificar el comportament dels llocs web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">més informació</a>."
diff --git a/localization/languages/cs.json b/localization/languages/cs.json
index 200573b61..58762df36 100644
--- a/localization/languages/cs.json
+++ b/localization/languages/cs.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Použít systémové záhlaví okna",
     "settingsAutoplayToggle": "Povolit automatické přehrávání",
+    "settingsDisableSwipeGestures": "Zakázat gesta trackpadu 'Zpět' a 'Vpřed'",
     "settingsOpenTabsInForegroundToggle": "Ihned přepínat na nově otevřené karty",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Uživatelské skripty umožňují upravit chování webových stránek - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">více informací</a>."
diff --git a/localization/languages/da.json b/localization/languages/da.json
index dda04f92e..8b12db34c 100644
--- a/localization/languages/da.json
+++ b/localization/languages/da.json
@@ -166,6 +166,7 @@
     "settingsSeparateTitlebarToggle": "Brug separat titellinje",
     "settingsAutoplayToggle": "Aktiver Autoplay",
     "settingsOpenTabsInForegroundToggle": "Åbn nye faner i forgrunden",
+    "settingsDisableGoBackwardAndGoForwardGestures": "Deaktiver 'Gå tilbage' og 'Gå fremad' trackpad-bevægelser",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Brugerscripts giver dig mulighed for at ændre adfærd på websteder - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">få mere at vide her</a>."
     },
diff --git a/localization/languages/de.json b/localization/languages/de.json
index 4106237d1..8c6b54c13 100644
--- a/localization/languages/de.json
+++ b/localization/languages/de.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Separate Titelleiste nutzen",
     "settingsAutoplayToggle": "Automatische Wiedergabe erlauben", 
+    "settingsDisableSwipeGestures": "Deaktivieren Sie 'Zurück' und 'Vorwärts' Trackpad-Gesten",
     "settingsOpenTabsInForegroundToggle": "Neue Tabs im Vordergrund öffnen",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Benutzerdefinierte Skripte erlauben es das Verhalten von Webseiten zu modifizieren - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\"> mehr dazu.</a>."
diff --git a/localization/languages/el.json b/localization/languages/el.json
index 667501afa..2e1aeb2fe 100644
--- a/localization/languages/el.json
+++ b/localization/languages/el.json
@@ -165,6 +165,7 @@
       "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Χρήση ξεχωριστής γραμμής τίτλου",
       "settingsAutoplayToggle": "Ενεργοποίηση αυτοαναπαραγωγής",
+      "settingsDisableGoBackwardAndGoForwardGestures": "Απενεργοποίηση χειρονομιών 'Πίσω' και 'Εμπρός' στο trackpad",
       "settingsOpenTabsInForegroundToggle": "Άνοιγμα νέας καρτέλας στο προσκήνιο",
       "settingsUserscriptsExplanation": {
         "unsafeHTML": "Τα scripts χρηστών σας επιτρέπουν να τροποποιήσετε την συμπεριφορά των ιστοσελίδων - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">μάθετε περισσότερα</a>."
diff --git a/localization/languages/en-US.json b/localization/languages/en-US.json
index 6fc6a6c53..af8c3db7e 100644
--- a/localization/languages/en-US.json
+++ b/localization/languages/en-US.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Language: ",
     "settingsSeparateTitlebarToggle": "Use separate title bar",
     "settingsAutoplayToggle": "Enable Autoplay",
+    "settingsDisableSwipeGestures": "Disable 'Go Back' and 'Go Forward' trackpad gestures",
     "settingsOpenTabsInForegroundToggle": "Open new tabs in the foreground",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "User scripts allow you to modify the behavior of websites - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">learn more</a>."
diff --git a/localization/languages/es.json b/localization/languages/es.json
index eb911541f..6056136d5 100644
--- a/localization/languages/es.json
+++ b/localization/languages/es.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Separar barra de título", //"Usar barra de título separada"
     "settingsAutoplayToggle": "Habilitar reproducción automática", 
+    "settingsDisableSwipeGestures": "Desactivar gestos de trackpad 'Ir Atrás' e 'Ir Adelante'",
     "settingsOpenTabsInForegroundToggle": "Abrir nuevas pestañas en primer plano",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Los userscripts te permiten modificar el comportamiento de los sitios web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Más información</a>."
diff --git a/localization/languages/fa.json b/localization/languages/fa.json
index 3a47afe61..691637187 100644
--- a/localization/languages/fa.json
+++ b/localization/languages/fa.json
@@ -166,6 +166,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "نمایش نوار عنوان",
     "settingsAutoplayToggle": "پخش خودکار",
+    "settingsDisableSwipeGestures": "غیرفعال کردن حرکات 'عقب' و 'جلو' در ترک‌پد",
     "settingsOpenTabsInForegroundToggle": null, //missing translation
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "اسکریپت های کاربر این اجازه را به شما می دهند تا رفتار سایت ها را تغییر دهید - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">اطلاعات بیشتر</a>."
diff --git a/localization/languages/fi.json b/localization/languages/fi.json
index d6021c70d..89d744413 100644
--- a/localization/languages/fi.json
+++ b/localization/languages/fi.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Käytä erillistä otsikkopalkkia",
     "settingsAutoplayToggle": "Toista automaattisesti",
+    "settingsDisableSwipeGestures": "Poista käytöstä 'Takaisin' ja 'Eteenpäin' ohjauslevyn eleet",
     "settingsOpenTabsInForegroundToggle": "Avaa uudet välilehdet etualalla",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Komentosarjat mahdollistavat sivustojen käyttäytymisen mukauttamisen - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">lisätietoja</a>."
diff --git a/localization/languages/fr.json b/localization/languages/fr.json
index 9289c611b..e6561c345 100644
--- a/localization/languages/fr.json
+++ b/localization/languages/fr.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Langue: ",
     "settingsSeparateTitlebarToggle": "Afficher une barre de titre séparée",
     "settingsAutoplayToggle": "Activer la lecture automatique", 
+    "settingsDisableSwipeGestures": "Désactiver les gestes du pavé tactile 'Reculer' et 'Avancer'",
     "settingsOpenTabsInForegroundToggle": "Ouvrir les nouveaux onglets au premiers plan",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Les scripts personnalisés vous permettent de modifier le comportement des pages web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">en savoir plus (en anglais)</a>."
diff --git a/localization/languages/hr.json b/localization/languages/hr.json
index e7bc142fc..1e4eae150 100644
--- a/localization/languages/hr.json
+++ b/localization/languages/hr.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Jezik: ",
     "settingsSeparateTitlebarToggle": "Koristi zasebnu naslovnu traku",
     "settingsAutoplayToggle": "Omogući automatsku reprodukciju",
+    "settingsDisableSwipeGestures": "Onemogući geste trackpada 'Natrag' i 'Naprijed'",
     "settingsOpenTabsInForegroundToggle": "Otvori nove kartice u prvom planu",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Korisničke skripte omogućuju vam izmjenu ponašanja web stranica - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Saznajte više</a>."
diff --git a/localization/languages/hu.json b/localization/languages/hu.json
index a7a83a3d6..c956ac285 100644
--- a/localization/languages/hu.json
+++ b/localization/languages/hu.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": null, //missing translation
     "settingsAutoplayToggle": null, //missing translation 
+    "settingsDisableSwipeGestures": "Tiltsa le a 'Vissza' és 'Előre' érintőpad gesztusokat",
     "settingsOpenTabsInForegroundToggle": null, //missing translation
     "settingsUserscriptsExplanation": "Felhasználói szkript magyarázat",
     "settingsUserscriptShowDirectory": null, //missing translation,
diff --git a/localization/languages/id.json b/localization/languages/id.json
index 13d601384..697b53766 100644
--- a/localization/languages/id.json
+++ b/localization/languages/id.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Gunakan bilah judul terpisah",
     "settingsAutoplayToggle": "Aktifkan Putar Otomatis",
+    "settingsDisableSwipeGestures": "Nonaktifkan gestur trackpad 'Mundur' dan 'Maju'",
     "settingsOpenTabsInForegroundToggle": "Buka tab baru di latar depan",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "User script memungkinkan Anda untuk merubah perilaku situs web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Pelajari lebih lanjut</a>."
diff --git a/localization/languages/it.json b/localization/languages/it.json
index 69724067b..238d95e9f 100644
--- a/localization/languages/it.json
+++ b/localization/languages/it.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Usa barra del titolo separata",
     "settingsAutoplayToggle": "Abilita Autoplay",
+    "settingsDisableSwipeGestures": "Disabilita i gesti 'Indietro' e 'Avanti' sul trackpad",
     "settingsOpenTabsInForegroundToggle": "Apri nuove schede in primo piano",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Gli script definiti dall'utente ti permettono di modificare il comportamento dei siti - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">scopri di più</a>."
diff --git a/localization/languages/ja.json b/localization/languages/ja.json
index 51466e0db..274fd56ed 100644
--- a/localization/languages/ja.json
+++ b/localization/languages/ja.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "別のタイトルバーを使用する",
     "settingsAutoplayToggle": "自動再生を有効にする",
+    "settingsDisableSwipeGestures": "トラックパッドの「戻る」と「進む」ジェスチャーを無効にする",
     "settingsOpenTabsInForegroundToggle": "フォアグラウンドで新しいタブを開く",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "ユーザースクリプトを使用して、Webサイトの動作を変更できます -  <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">詳細</a>。"
diff --git a/localization/languages/ko.json b/localization/languages/ko.json
index d39cbc877..1f624df0a 100644
--- a/localization/languages/ko.json
+++ b/localization/languages/ko.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "언어 선택",
     "settingsSeparateTitlebarToggle": "윈도우 기본 표시줄 사용",
     "settingsAutoplayToggle": "자동재생 사용",
+    "settingsDisableSwipeGestures": "트랙패드 '뒤로 가기' 및 '앞으로 가기' 제스처 비활성화",
     "settingsOpenTabsInForegroundToggle": "새 탭으로 열기 후에 열린 탭으로 이동",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "스크립트를 사용하면 사이트의 동작을 수정할 수 있습니다. - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">더보기</a>."
diff --git a/localization/languages/lt.json b/localization/languages/lt.json
index 729dbf71b..455dbf38b 100644
--- a/localization/languages/lt.json
+++ b/localization/languages/lt.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": null, //missing translation
     "settingsAutoplayToggle": null, //missing translation 
+    "settingsDisableSwipeGestures": "Išjungti 'Atgal' ir 'Pirmyn' lietimų gestus",
     "settingsOpenTabsInForegroundToggle": null, //missing translation
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Naudotojo scenarijai leidžia jums modifikuoti internetinių svetainių elgseną - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">sužinokite daugiau</a>."
diff --git a/localization/languages/nl.json b/localization/languages/nl.json
index 125e4bfad..b76a0252e 100644
--- a/localization/languages/nl.json
+++ b/localization/languages/nl.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Taal: ",
     "settingsSeparateTitlebarToggle": "Gebruik aparte titelbalk",
     "settingsAutoplayToggle": "Automatisch afspelen inschakelen",
+    "settingsDisableSwipeGestures": "Schakel trackpad-gebaren 'Vorige' en 'Volgende' uit",
     "settingsOpenTabsInForegroundToggle": "Open nieuwe tabbladen op de voorgrond",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Gebruikersscripten kunt u gebruiken om het gedrag van websites te wijzigingen - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">lees meer</a>."
diff --git a/localization/languages/pl.json b/localization/languages/pl.json
index 339f1c400..3cdb54b9b 100644
--- a/localization/languages/pl.json
+++ b/localization/languages/pl.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Język: ",
     "settingsSeparateTitlebarToggle": "Użyj osobnego paska tytułu",
     "settingsAutoplayToggle": "Włącz autoodtwarzanie",
+    "settingsDisableSwipeGestures": "Wyłącz gesty 'Wstecz' i 'Dalej' na gładziku",
     "settingsOpenTabsInForegroundToggle": "Otwórz nowe karty na pierwszym planie",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Skrypty użytkownika pozwalają modyfikować zachowanie stron internetowych - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">dowiedz się więcej</a>."
diff --git a/localization/languages/pt-BR.json b/localization/languages/pt-BR.json
index fae9ba660..308ab1993 100644
--- a/localization/languages/pt-BR.json
+++ b/localization/languages/pt-BR.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Idioma: ",
     "settingsSeparateTitlebarToggle": "Usar a barra de título separada",
     "settingsAutoplayToggle": "Habilitar reprodução automática",
+    "settingsDisableGoBackwardAndGoForwardGestures": "Desativar gestos de trackpad 'Voltar' e 'Avançar'",
     "settingsOpenTabsInForegroundToggle": "Abrir novas abas em primeiro plano",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Scripts do usuário permitem modificar o comportamento do site - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Saiba mais</a>."
diff --git a/localization/languages/pt-PT.json b/localization/languages/pt-PT.json
index e6b71324e..d9bfa960d 100644
--- a/localization/languages/pt-PT.json
+++ b/localization/languages/pt-PT.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Idioma:",
     "settingsSeparateTitlebarToggle": "Utilizar barra de título separada",
     "settingsAutoplayToggle": "Ativar reprodução automática",
+    "settingsDisableSwipeGestures": "Desativar gestos de trackpad 'Voltar' e 'Avançar'",
     "settingsOpenTabsInForegroundToggle": "Abrir novos separadores em primeiro plano",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Os scripts permitem-lhe alterar o comportamento dos sites - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Saber mais</a>."
diff --git a/localization/languages/ru.json b/localization/languages/ru.json
index f2de85335..084cfd64e 100644
--- a/localization/languages/ru.json
+++ b/localization/languages/ru.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Язык: ",
     "settingsSeparateTitlebarToggle": "Использовать системный заголовок окна",
     "settingsAutoplayToggle": "Включить автоматическое воспроизведение",
+    "settingsDisableSwipeGestures": "Отключить жесты 'Назад' и 'Вперед' на трекпаде",
     "settingsOpenTabsInForegroundToggle": "Открывать новые вкладки на переднем плане",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Пользовательские скрипты позволяют изменять поведение сайтов - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">узнать больше</a>."
diff --git a/localization/languages/sr.json b/localization/languages/sr.json
index 1a41af0f5..287e7b1ce 100644
--- a/localization/languages/sr.json
+++ b/localization/languages/sr.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Koristi zasebanu naslovnu traku",
     "settingsAutoplayToggle": "Dozvoli automatsku reprodukciju",
+    "settingsDisableSwipeGestures": "Isključi 'Nazad' i 'Napred' pokrete na tačpadu",
     "settingsOpenTabsInForegroundToggle": "Otvori nove tabove u prvom planu",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Korisničke skripte omogućavaju modifikovanje ponašanja sajtova - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">learn more</a>."
diff --git a/localization/languages/sv.json b/localization/languages/sv.json
index f5610cc51..444ef70b8 100644
--- a/localization/languages/sv.json
+++ b/localization/languages/sv.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Språk: ",
     "settingsSeparateTitlebarToggle": "Använd separat titelrad",
     "settingsAutoplayToggle": "Aktivera automatisk uppspelning",
+    "settingsDisableSwipeGestures": "Inaktivera 'Gå tillbaka' och 'Gå framåt' styrplattagester",
     "settingsOpenTabsInForegroundToggle": "Öppna nya flikar i förgrunden",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Användarscript låter dig ändra beteendet hos webbsidor - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">lär dig mer</a>."
diff --git a/localization/languages/th.json b/localization/languages/th.json
index fd4476f8b..72abb47ae 100644
--- a/localization/languages/th.json
+++ b/localization/languages/th.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "ใช้ชื่อแถบเรื่องแยกต่างหาก",
     "settingsAutoplayToggle": "เปิดใช้งานการเล่นอัตโนมัติ",
+    "settingsDisableSwipeGestures": "ปิดใช้งานท่าทาง 'ย้อนกลับ' และ 'ไปข้างหน้า' บนแทร็กแพด",
     "settingsOpenTabsInForegroundToggle": "เปิดแท็บใหม่ให้อยู่เบื้องหน้า",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "สคริปต์ผู้ใช้ที่จะช่วยให้คุณปรับเปลี่ยนพฤติกรรมของเว็บไซต์ได้ - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">เรียนรู้เพิ่มเติม</a>."
diff --git a/localization/languages/tr.json b/localization/languages/tr.json
index 8712c8d7b..227e85e6b 100644
--- a/localization/languages/tr.json
+++ b/localization/languages/tr.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": "Dil: ",
     "settingsSeparateTitlebarToggle": "Ayrılmış başlık çubuğu kullan",
     "settingsAutoplayToggle": "Otomatik oynatmayı etkinleştir",
+    "settingsDisableSwipeGestures": "Trackpad 'Geri Git' ve 'İleri Git' hareketlerini devre dışı bırak",
     "settingsOpenTabsInForegroundToggle": "Yeni sekmeleri önplanda aç",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Kullancı betikleri size websitelerinin davranışını değiştirmenize izin verir - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">daha fazla bilgi için</a>."
diff --git a/localization/languages/uk.json b/localization/languages/uk.json
index 805221074..7a7684d9e 100644
--- a/localization/languages/uk.json
+++ b/localization/languages/uk.json
@@ -166,6 +166,7 @@
     "settingsLanguageSelection": "Мова: ",
     "settingsSeparateTitlebarToggle": "Використовувати окремий рядок заголовка",
     "settingsAutoplayToggle": "Увімкнути автовідтворення",
+    "settingsDisableSwipeGestures": "Вимкнути жести трекпада 'Назад' і 'Вперед'",
     "settingsOpenTabsInForegroundToggle": "Відкривати нові вкладки на передньому плані",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Скрипти користувача дозволяють змінювати поведінку веб-сайтів - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">дізнатися більше</a>."
diff --git a/localization/languages/uz.json b/localization/languages/uz.json
index a5b9680a6..aaca7876c 100644
--- a/localization/languages/uz.json
+++ b/localization/languages/uz.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Alohida sarlavha paneli ishlatish",
     "settingsAutoplayToggle": null, //missing translation 
+    "settingsDisableSwipeGestures": "Trackpad 'Orqaga' va 'Oldinga' harakatlarini o‘chirish",
     "settingsOpenTabsInForegroundToggle": null, //missing translation
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "Foydalanuvchi skriptlari sahifa ishlashini o'zgartirishga yordam beradi - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">qo'shimcha ma'lumot</a>."
diff --git a/localization/languages/vi.json b/localization/languages/vi.json
index 99d6c0978..a86989d3c 100644
--- a/localization/languages/vi.json
+++ b/localization/languages/vi.json
@@ -158,6 +158,7 @@
         "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "Sử dụng title bả tách rời",
         "settingsAutoplayToggle": "Bật Autoplay", 
+        "settingsDisableSwipeGestures": "Tắt cử chỉ của trackpad 'Quay lại' và 'Tiến lên'",
         "settingsOpenTabsInForegroundToggle": "Mở các tab mới ở nền trước",
         "settingsUserscriptsExplanation": {
             "unsafeHTML": "Mã script người dùng có thể cho bạn thay đổi hành vi trang web - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">Xem thêm</a>."
@@ -305,4 +306,4 @@
         "clickToCopy": "Bấm để sao chép",
         "copied": "Đã sao chép"
     }
-}
\ No newline at end of file
+}
diff --git a/localization/languages/zh-CN.json b/localization/languages/zh-CN.json
index d25a46bba..e3b59520d 100644
--- a/localization/languages/zh-CN.json
+++ b/localization/languages/zh-CN.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "显示浏览器标题栏",
     "settingsAutoplayToggle": "启用自动播放",
+    "settingsDisableSwipeGestures": "禁用触控板的‘后退’和‘前进’手势",
     "settingsOpenTabsInForegroundToggle": "在前台打开新标签页",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "自定义脚本允许您改变网站行为 - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">查看更多</a>."
diff --git a/localization/languages/zh-TW.json b/localization/languages/zh-TW.json
index dfcdf75a5..d36d8d02e 100644
--- a/localization/languages/zh-TW.json
+++ b/localization/languages/zh-TW.json
@@ -165,6 +165,7 @@
     "settingsLanguageSelection": null, //missing translation
     "settingsSeparateTitlebarToggle": "分割標題列",
     "settingsAutoplayToggle": "自動播放媒體",
+    "settingsDisableSwipeGestures": "禁用觸控板的『後退』和『前進』手勢",
     "settingsOpenTabsInForegroundToggle": "在前景開啟新分頁",
     "settingsUserscriptsExplanation": {
       "unsafeHTML": "使用者指令允許您改變網站的行為 - <a href=\"https://github.com/minbrowser/min/wiki/userscripts\">查看更多</a>."
diff --git a/pages/settings/index.html b/pages/settings/index.html
index bc608428c..ea588f8d7 100644
--- a/pages/settings/index.html
+++ b/pages/settings/index.html
@@ -184,6 +184,14 @@ <h3 data-string="settingsAdditionalFeaturesHeading"></h3>
         ></label>
       </div>
 
+      <div class="setting-section" id="section-disable-swipe-gestures">
+        <input type="checkbox" id="checkbox-disable-swipe-gestures" />
+        <label
+          for="checkbox-disable-swipe-gestures"
+          data-string="settingsDisableSwipeGestures"
+        ></label>
+      </div>
+
       <div class="setting-section" id="section-open-tabs-in-foreground">
         <input type="checkbox" id="checkbox-open-tabs-in-foreground" />
         <label
diff --git a/pages/settings/settings.js b/pages/settings/settings.js
index a5e46f2be..ae93d096a 100644
--- a/pages/settings/settings.js
+++ b/pages/settings/settings.js
@@ -7,6 +7,7 @@ var showDividerCheckbox = document.getElementById('checkbox-show-divider')
 var userscriptsCheckbox = document.getElementById('checkbox-userscripts')
 var userscriptsShowDirectorySection = document.getElementById('userscripts-show-directory')
 var separateTitlebarCheckbox = document.getElementById('checkbox-separate-titlebar')
+var disableSwipeGesturesCheckbox = document.getElementById('checkbox-disable-swipe-gestures')
 var openTabsInForegroundCheckbox = document.getElementById('checkbox-open-tabs-in-foreground')
 var autoPlayCheckbox = document.getElementById('checkbox-enable-autoplay')
 var userAgentCheckbox = document.getElementById('checkbox-user-agent')
@@ -316,6 +317,18 @@ separateTitlebarCheckbox.addEventListener('change', function (e) {
   showRestartRequiredBanner()
 })
 
+/* gesture controlled go-back and go-forward setting */
+
+settings.get('disableSwipeGestures', function (value) {
+  if (value === true) {
+    disableSwipeGesturesCheckbox.checked = true
+  }
+})
+
+disableSwipeGesturesCheckbox.addEventListener('change', function (e) {
+  settings.set('disableSwipeGestures', this.checked)
+})
+
 /* tabs in foreground setting */
 
 settings.get('openTabsInForeground', function (value) {