diff --git a/src/http/OptionDialog.cpp b/src/http/OptionDialog.cpp
index a82e2c77..fd30f874 100644
--- a/src/http/OptionDialog.cpp
+++ b/src/http/OptionDialog.cpp
@@ -30,6 +30,9 @@ OptionDialog::OptionDialog(QWidget *parent) :
     m_ui->warningWidget->showMessage(tr("The following options can be dangerous!\nChange them only if you know what you are doing."), MessageWidget::Warning);
     m_ui->warningWidget->setIcon(FilePath::instance()->icon("status", "dialog-warning"));
     m_ui->warningWidget->setCloseButtonVisible(false);
+
+    m_ui->tabWidget->setEnabled(m_ui->enableHttpServer->isChecked());
+    connect(m_ui->enableHttpServer, SIGNAL(toggled(bool)), m_ui->tabWidget, SLOT(setEnabled(bool)));
 }
 
 OptionDialog::~OptionDialog()
diff --git a/src/http/OptionDialog.ui b/src/http/OptionDialog.ui
index f3171733..e78199c0 100644
--- a/src/http/OptionDialog.ui
+++ b/src/http/OptionDialog.ui
@@ -28,9 +28,11 @@
    </property>
    <item>
     <widget class="QCheckBox" name="enableHttpServer">
+     <property name="toolTip">
+      <string>This is required for accessing your databases from ChromeIPass or PassIFox</string>
+     </property>
      <property name="text">
-      <string>Enable KeepassXC HTTP protocol
-This is required for accessing your databases from ChromeIPass or PassIFox</string>
+      <string>Enable KeePassHTTP server</string>
      </property>
     </widget>
    </item>