diff --git a/src/gui/insEdit.cpp b/src/gui/insEdit.cpp
index e02f39695..ca254d2c8 100644
--- a/src/gui/insEdit.cpp
+++ b/src/gui/insEdit.cpp
@@ -2262,9 +2262,11 @@ void FurnaceGUI::drawInsEdit() {
 
         ImGui::TableNextColumn();
         ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+        ImGui::PushID(2+curIns);
         if (ImGui::InputText("##Name",&ins->name)) {
           MARK_MODIFIED;
         }
+        ImGui::PopID();
 
         ImGui::TableNextRow();
         ImGui::TableNextColumn();
diff --git a/src/gui/intro.cpp b/src/gui/intro.cpp
index db886316b..42d369577 100644
--- a/src/gui/intro.cpp
+++ b/src/gui/intro.cpp
@@ -95,6 +95,7 @@ void FurnaceGUI::endIntroTune() {
   selEnd=SelectionPoint();
   cursor=SelectionPoint();
   updateWindowTitle();
+  updateScroll(0);
 }
 
 void FurnaceGUI::drawIntro(double introTime, bool monitor) {
diff --git a/src/gui/sampleEdit.cpp b/src/gui/sampleEdit.cpp
index 238f37e88..8f5a9843a 100644
--- a/src/gui/sampleEdit.cpp
+++ b/src/gui/sampleEdit.cpp
@@ -158,9 +158,11 @@ void FurnaceGUI::drawSampleEdit() {
       ImGui::Text("Name");
       ImGui::SameLine();
       ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x);
+      ImGui::PushID(2+curSample);
       if (ImGui::InputText("##SampleName",&sample->name)) {
         MARK_MODIFIED;
       }
+      ImGui::PopID();
 
       ImGui::Separator();