diff --git a/src/gui/gui.h b/src/gui/gui.h
index 53b2f1715..41d3590ed 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -775,6 +775,7 @@ class FurnaceGUI {
     int roundedMenus;
     int loadJapanese;
     int fmLayout;
+    int sampleLayout;
     int susPosition;
     int effectCursorDir;
     int cursorPastePos;
@@ -838,6 +839,7 @@ class FurnaceGUI {
       roundedMenus(0),
       loadJapanese(0),
       fmLayout(0),
+      sampleLayout(0),
       susPosition(0),
       effectCursorDir(1),
       cursorPastePos(1),
diff --git a/src/gui/settings.cpp b/src/gui/settings.cpp
index d8070dc65..9c64f404e 100644
--- a/src/gui/settings.cpp
+++ b/src/gui/settings.cpp
@@ -832,6 +832,8 @@ void FurnaceGUI::drawSettings() {
           settings.susPosition=1;
         }
 
+        ImGui::Separator();
+
         bool macroViewB=settings.macroView;
         if (ImGui::Checkbox("Classic macro view (standard macros only; deprecated!)",&macroViewB)) {
           settings.macroView=macroViewB;
@@ -878,6 +880,11 @@ void FurnaceGUI::drawSettings() {
 
         ImGui::Separator();
 
+        bool sampleLayoutB=settings.sampleLayout;
+        if (ImGui::Checkbox("Use compact sample editor",&sampleLayoutB)) {
+          settings.sampleLayout=sampleLayoutB;
+        }
+
         bool roundedWindowsB=settings.roundedWindows;
         if (ImGui::Checkbox("Rounded window corners",&roundedWindowsB)) {
           settings.roundedWindows=roundedWindowsB;
@@ -1502,6 +1509,7 @@ void FurnaceGUI::syncSettings() {
   settings.roundedMenus=e->getConfInt("roundedMenus",0);
   settings.loadJapanese=e->getConfInt("loadJapanese",0);
   settings.fmLayout=e->getConfInt("fmLayout",0);
+  settings.sampleLayout=e->getConfInt("sampleLayout",0);
   settings.susPosition=e->getConfInt("susPosition",0);
   settings.effectCursorDir=e->getConfInt("effectCursorDir",1);
   settings.cursorPastePos=e->getConfInt("cursorPastePos",1);
@@ -1632,6 +1640,7 @@ void FurnaceGUI::commitSettings() {
   e->setConf("roundedMenus",settings.roundedMenus);
   e->setConf("loadJapanese",settings.loadJapanese);
   e->setConf("fmLayout",settings.fmLayout);
+  e->setConf("sampleLayout",settings.sampleLayout);
   e->setConf("susPosition",settings.susPosition);
   e->setConf("effectCursorDir",settings.effectCursorDir);
   e->setConf("cursorPastePos",settings.cursorPastePos);