diff --git a/src/lib/gui/dialogs/SettingsDialog.cpp b/src/lib/gui/dialogs/SettingsDialog.cpp
index cfc15087c..15d34297a 100644
--- a/src/lib/gui/dialogs/SettingsDialog.cpp
+++ b/src/lib/gui/dialogs/SettingsDialog.cpp
@@ -187,12 +187,6 @@ void SettingsDialog::setLogToFile(bool logToFile)
   ui->widgetLogFilename->setEnabled(logToFile);
 }
 
-void SettingsDialog::showEvent(QShowEvent *event)
-{
-  QDialog::showEvent(event);
-  Q_EMIT shown();
-}
-
 void SettingsDialog::resetAllSettings()
 {
   auto result = QMessageBox::question(
@@ -378,8 +372,14 @@ void SettingsDialog::updateControls()
   ui->comboInterface->setEnabled(writable);
   ui->comboLogLevel->setEnabled(writable);
   ui->groupLogToFile->setEnabled(writable);
+  ui->comboLanguage->setEnabled(writable);
+  ui->cbShowVersion->setEnabled(writable);
+  ui->cbGuiDebug->setEnabled(writable);
+  ui->rbIconColorful->setEnabled(writable);
+  ui->rbIconMono->setEnabled(writable);
   ui->rbAutoHide->setEnabled(writable);
   ui->rbShowOnStart->setEnabled(writable);
+  ui->btnClearAllSettings->setEnabled(writable);
   ui->cbAutoUpdate->setEnabled(writable);
   ui->cbPreventSleep->setEnabled(writable);
   ui->lineTlsCertPath->setEnabled(writable);
diff --git a/src/lib/gui/dialogs/SettingsDialog.h b/src/lib/gui/dialogs/SettingsDialog.h
index 354e71e86..5bf697380 100644
--- a/src/lib/gui/dialogs/SettingsDialog.h
+++ b/src/lib/gui/dialogs/SettingsDialog.h
@@ -27,7 +27,6 @@ public:
   ~SettingsDialog() override;
 
 Q_SIGNALS:
-  void shown();
   void requestRemoveAllSettings();
 
 protected:
@@ -40,7 +39,6 @@ private:
   void browseLogPath();
   void setLogToFile(bool logToFile);
   void accept() override;
-  void showEvent(QShowEvent *event) override;
   bool isClientMode() const;
   void updateTlsControls();
   void updateTlsControlsEnabled();