diff --git a/TODO.md b/TODO.md
index 34f7d1d7d..62364e065 100644
--- a/TODO.md
+++ b/TODO.md
@@ -16,7 +16,6 @@
 - try to find out why does VSlider not accept keyboard input
 - finish lock layout
 - if macros have release, note off should release them
-- store edit/followOrders/followPattern state in config
 - add ability to select a column by double clicking
 - add ability to move selection by dragging
 - Apply button in settings
diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4f5a5e92f..f551c315b 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -3657,6 +3657,9 @@ bool FurnaceGUI::init() {
   fullScreen=e->getConfBool("fullScreen",false);
 #endif
   mobileUI=e->getConfBool("mobileUI",MOBILE_UI_DEFAULT);
+  edit=e->getConfBool("edit",false);
+  followOrders=e->getConfBool("followOrders",true);
+  followPattern=e->getConfBool("followPattern",true);
 
   syncSettings();
 
@@ -3840,6 +3843,9 @@ bool FurnaceGUI::finish() {
   e->setConf("lockLayout",lockLayout);
   e->setConf("fullScreen",fullScreen);
   e->setConf("mobileUI",mobileUI);
+  e->setConf("edit",edit);
+  e->setConf("followOrders",followOrders);
+  e->setConf("followPattern",followPattern);
 
   for (int i=0; i<DIV_MAX_CHANS; i++) {
     delete oldPat[i];