diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index 7fd509e29..0a2416363 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -2678,8 +2678,8 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
     }
     case 3: {
       if (ImGui::BeginTable("MacroList",2,ImGuiTableFlags_Borders)) {
-        ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthFixed);
-        ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch);
+        ImGui::TableSetupColumn("c0",ImGuiTableColumnFlags_WidthStretch,0.2f);
+        ImGui::TableSetupColumn("c1",ImGuiTableColumnFlags_WidthStretch,0.8f);
 
         ImGui::TableNextRow();
         ImGui::TableNextColumn();
@@ -2695,12 +2695,8 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
           } else {
             snprintf(buf,255,"%s",macros[i].displayName);
           }
-          float stretchX=ImGui::CalcTextSize(buf).x;
 
-
-          ImVec2 size=ImGui::CalcTextSize(buf);
-          size.x=MAX(stretchX,size.x);
-          if (ImGui::Selectable(buf,state.selectedMacro==(int)i,0,size)) {
+          if (ImGui::Selectable(buf,state.selectedMacro==(int)i)) {
             state.selectedMacro=i;
           }
         }
@@ -2776,6 +2772,7 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
               ImGui::TableNextRow();
               if (showLen) {
                 ImGui::TableNextColumn();
+                ImGui::AlignTextToFramePadding();
                 ImGui::Text(shortLabels ? _("Len##macroEditLengthShortLabel") : _("Length"));
                 if (shortLabels && ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _("Length"));
                 ImGui::SameLine();
@@ -2788,6 +2785,7 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
                 }
               }
               ImGui::TableNextColumn();
+              ImGui::AlignTextToFramePadding();
               ImGui::Text(shortLabels ? _("SLen##macroEditStepLenShortLabel") : _("StepLen"));
               if (shortLabels && ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _("StepLen"));
               ImGui::SameLine();
@@ -2797,6 +2795,7 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
                 MARK_MODIFIED;
               }
               ImGui::TableNextColumn();
+              ImGui::AlignTextToFramePadding();
               ImGui::Text(shortLabels ? _("Del##macroEditDelayShortLabel") : _("Delay"));
               if (shortLabels && ImGui::IsItemHovered()) ImGui::SetTooltip("%s", _("Delay"));
               ImGui::SameLine();