diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 40a6035c4..e18d3a79b 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -5579,6 +5579,8 @@ FurnaceGUI::FurnaceGUI():
   loopRow(-1),
   loopEnd(-1),
   isClipping(0),
+  extraChannelButtons(0),
+  patNameTarget(-1),
   editControlsOpen(true),
   ordersOpen(true),
   insListOpen(true),
@@ -5603,13 +5605,13 @@ FurnaceGUI::FurnaceGUI():
   selecting(false),
   curNibble(false),
   orderNibble(false),
-  extraChannelButtons(false),
   followOrders(true),
   followPattern(true),
   changeAllOrders(false),
   collapseWindow(false),
   demandScrollX(false),
   fancyPattern(false),
+  wantPatName(false),
   curWindow(GUI_WINDOW_NOTHING),
   nextWindow(GUI_WINDOW_NOTHING),
   wavePreviewOn(false),
diff --git a/src/gui/gui.h b/src/gui/gui.h
index 3e15b1417..318ee1789 100644
--- a/src/gui/gui.h
+++ b/src/gui/gui.h
@@ -516,14 +516,14 @@ class FurnaceGUI {
   char finalLayoutPath[4096];
 
   int curIns, curWave, curSample, curOctave, oldRow, oldOrder, oldOrder1, editStep, exportLoops, soloChan, soloTimeout, orderEditMode, orderCursor;
-  int loopOrder, loopRow, loopEnd, isClipping;
+  int loopOrder, loopRow, loopEnd, isClipping, extraChannelButtons, patNameTarget;
   bool editControlsOpen, ordersOpen, insListOpen, songInfoOpen, patternOpen, insEditOpen;
   bool waveListOpen, waveEditOpen, sampleListOpen, sampleEditOpen, aboutOpen, settingsOpen;
   bool mixerOpen, debugOpen, oscOpen, volMeterOpen, statsOpen, compatFlagsOpen;
   bool pianoOpen, notesOpen, channelsOpen;
   SelectionPoint selStart, selEnd, cursor;
-  bool selecting, curNibble, orderNibble, extraChannelButtons, followOrders, followPattern, changeAllOrders;
-  bool collapseWindow, demandScrollX, fancyPattern;
+  bool selecting, curNibble, orderNibble, followOrders, followPattern, changeAllOrders;
+  bool collapseWindow, demandScrollX, fancyPattern, wantPatName;
   FurnaceGUIWindows curWindow, nextWindow;
   float peak[2];
   float patChanX[DIV_MAX_CHANS+1];
diff --git a/src/gui/pattern.cpp b/src/gui/pattern.cpp
index 5135b3048..b86180289 100644
--- a/src/gui/pattern.cpp
+++ b/src/gui/pattern.cpp
@@ -17,10 +17,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <imgui.h>
 #define _USE_MATH_DEFINES
 #include "gui.h"
 #include "imgui_internal.h"
 #include "IconsFontAwesome4.h"
+#include "misc/cpp/imgui_stdlib.h"
 #include "guiConst.h"
 #include <fmt/printf.h>
 
@@ -376,8 +378,8 @@ void FurnaceGUI::drawPattern() {
       }
       ImGui::TableNextRow();
       ImGui::TableNextColumn();
-      if (ImGui::Selectable(extraChannelButtons?" --##ExtraChannelButtons":" ++##ExtraChannelButtons",false,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) {
-        extraChannelButtons=!extraChannelButtons;
+      if (ImGui::Selectable((extraChannelButtons==2)?" --##ExtraChannelButtons":" ++##ExtraChannelButtons",false,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) {
+        if (++extraChannelButtons>2) extraChannelButtons=0;
       }
       if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
         fancyPattern=!fancyPattern;
@@ -448,7 +450,34 @@ void FurnaceGUI::drawPattern() {
         if (settings.soloAction!=2) if (ImGui::IsItemClicked(ImGuiMouseButton_Right)) {
           e->toggleSolo(i);
         }
-        if (extraChannelButtons) {
+        if (extraChannelButtons==2) {
+          DivPattern* pat=e->song.pat[i].getPattern(e->song.orders.ord[i][ord],true);
+          ImGui::PushFont(mainFont);
+          if (patNameTarget==i) {
+            snprintf(chanID,2048,"##PatNameI%d_%d",i,ord);
+            ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x-(8.0f*dpiScale));
+            ImGui::SetCursorPosX(ImGui::GetCursorPosX()+4.0f*dpiScale);
+            ImGui::InputText(chanID,&pat->name);
+            if (wantPatName) {
+              wantPatName=false;
+              ImGui::SetItemDefaultFocus();
+              ImGui::SetKeyboardFocusHere(-1);
+            } else {
+              if (!ImGui::IsItemActive()) {
+                patNameTarget=-1;
+              }
+            }
+          } else {
+            snprintf(chanID,2048," %s##PatName%d",pat->name.c_str(),i);
+            if (ImGui::Selectable(chanID,true,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale))) {
+              patNameTarget=i;
+              wantPatName=true;
+              snprintf(chanID,2048,"##PatNameI%d_%d",i,ord);
+              ImGui::SetActiveID(ImGui::GetID(chanID),ImGui::GetCurrentWindow());
+            }
+          }
+          ImGui::PopFont();
+        } else if (extraChannelButtons==1) {
           snprintf(chanID,2048,"%c##_HCH%d",e->song.chanCollapse[i]?'+':'-',i);
           ImGui::SetCursorPosX(ImGui::GetCursorPosX()+4.0f*dpiScale);
           if (ImGui::SmallButton(chanID)) {