diff --git a/src/lib/preferences/preferences.cpp b/src/lib/preferences/preferences.cpp
index 02c48daa2..c4382c415 100644
--- a/src/lib/preferences/preferences.cpp
+++ b/src/lib/preferences/preferences.cpp
@@ -172,7 +172,9 @@ Preferences::Preferences(QupZilla* mainClass, QWidget* parent)
     ui->closedInsteadOpened->setChecked(settings.value("closedInsteadOpenedTabs", false).toBool());
     ui->showTabPreviews->setChecked(settings.value("showTabPreviews", true).toBool());
     ui->animatedTabPreviews->setChecked(settings.value("tabPreviewAnimationsEnabled", true).toBool());
+    ui->showCloseButtonOnTabs->setChecked(settings.value("showCloseButtonOnTabs", true).toBool());
     settings.endGroup();
+
     connect(ui->showTabPreviews, SIGNAL(toggled(bool)), this, SLOT(showTabPreviewsChanged(bool)));
     showTabPreviewsChanged(ui->showTabPreviews->isChecked());
 
@@ -777,6 +779,7 @@ void Preferences::saveSettings()
     settings.setValue("closedInsteadOpenedTabs", ui->closedInsteadOpened->isChecked());
     settings.setValue("showTabPreviews", ui->showTabPreviews->isChecked());
     settings.setValue("tabPreviewAnimationsEnabled", ui->animatedTabPreviews->isChecked());
+    settings.setValue("showCloseButtonOnTabs", ui->showCloseButtonOnTabs->isChecked());
     settings.endGroup();
 
     //DOWNLOADS
diff --git a/src/lib/preferences/preferences.ui b/src/lib/preferences/preferences.ui
index 178ac7484..08011c525 100644
--- a/src/lib/preferences/preferences.ui
+++ b/src/lib/preferences/preferences.ui
@@ -660,6 +660,13 @@
              </item>
             </layout>
            </item>
+           <item>
+            <widget class="QCheckBox" name="showCloseButtonOnTabs">
+             <property name="text">
+              <string>Show close button on tabs</string>
+             </property>
+            </widget>
+           </item>
            <item>
             <widget class="QCheckBox" name="hideTabsOnTab">
              <property name="text">