diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index d2630aca..e1e2654d 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -5026,6 +5026,10 @@ bool FurnaceGUI::init() {
   followOrders=e->getConfBool("followOrders",true);
   followPattern=e->getConfBool("followPattern",true);
   noteInputPoly=e->getConfBool("noteInputPoly",true);
+  exportLoops=e->getConfInt("exportLoops",0);
+  if (exportLoops<0) exportLoops=0;
+  exportFadeOut=e->getConfDouble("exportFadeOut",0.0);
+  if (exportFadeOut<0.0) exportFadeOut=0.0;
   orderEditMode=e->getConfInt("orderEditMode",0);
   if (orderEditMode<0) orderEditMode=0;
   if (orderEditMode>3) orderEditMode=3;
@@ -5359,6 +5363,8 @@ bool FurnaceGUI::finish() {
   e->setConf("followPattern",followPattern);
   e->setConf("orderEditMode",orderEditMode);
   e->setConf("noteInputPoly",noteInputPoly);
+  e->setConf("exportLoops",exportLoops);
+  e->setConf("exportFadeOut",exportFadeOut);
 
   // commit oscilloscope state
   e->setConf("oscZoom",oscZoom);
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index 9db0e04b..a5f8c4fc 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -40,8 +40,9 @@
 #define POWER_SAVE_DEFAULT 0
 #endif
 
-#ifdef __HAIKU__
+#if defined(__HAIKU__) || defined(IS_MOBILE)
 // NFD doesn't support Haiku
+// I still haven't implemented Android file picker
 #define SYS_FILE_DIALOG_DEFAULT 0
 #else
 #define SYS_FILE_DIALOG_DEFAULT 1