diff --git a/src/Gui/DlgEditorImp.cpp b/src/Gui/DlgEditorImp.cpp
index 7cf4ec8f02..4ff7c225d2 100644
--- a/src/Gui/DlgEditorImp.cpp
+++ b/src/Gui/DlgEditorImp.cpp
@@ -57,6 +57,8 @@ DlgSettingsEditorImp::DlgSettingsEditorImp( QWidget* parent )
   : PreferencePage( parent )
 {
     this->setupUi(this);
+    this->EnableFolding->hide(); // Switch off until we have an editor with folding
+
     d = new DlgSettingsEditorP();
     QColor col;
     col = Qt::black; 
diff --git a/src/Gui/DlgSettingsMacroImp.cpp b/src/Gui/DlgSettingsMacroImp.cpp
index 496d563092..6160f5702b 100644
--- a/src/Gui/DlgSettingsMacroImp.cpp
+++ b/src/Gui/DlgSettingsMacroImp.cpp
@@ -38,6 +38,11 @@ DlgSettingsMacroImp::DlgSettingsMacroImp( QWidget* parent )
   : PreferencePage( parent )
 {
     this->setupUi(this);
+
+    // Was never implemented, so hide it
+    this->FileLogCheckBox->hide();
+    this->MacroPath_2->hide();
+
     if (MacroPath->fileName().isEmpty()) {
         QDir d(QString::fromUtf8(App::GetApplication().getUserMacroDir().c_str()));
         MacroPath->setFileName(d.path());