diff --git a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
index 3fba095..1d922a3 100644
--- a/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/BaseVisualGeometrySidedef.cs
@@ -1592,10 +1592,11 @@ namespace CodeImp.DoomBuilder.BuilderModes
 
         protected virtual int ChangeOffsetX(int amount)
         {
+			int prevX = Sidedef.OffsetX;
             Sidedef.OffsetX -= amount;
             if (Texture != null && Texture.IsImageLoaded)
 			{
-                int repeatmidtexoffset = General.Map.SRB2 && Sidedef.Line.IsFlagSet(General.Map.Config.RepeatMidtextureFlag) ? (Sidedef.OffsetX / 4096) * 4096 : 0;
+                int repeatmidtexoffset = General.Map.SRB2 && Sidedef.Line.IsFlagSet(General.Map.Config.RepeatMidtextureFlag) ? (prevX / 4096) * 4096 : 0;
                 Sidedef.OffsetX %= Texture.Width;
                 Sidedef.OffsetX += repeatmidtexoffset;
             }
diff --git a/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
index aacc325..27506c4 100644
--- a/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
+++ b/Source/Plugins/BuilderModes/VisualModes/VisualMiddleDouble.cs
@@ -38,7 +38,6 @@ namespace CodeImp.DoomBuilder.BuilderModes
 
 		#region ================== Variables
 
-		// TODO: Resolve this while retaining correct behavior
 		private bool repeatmidtex;
 		private Plane topclipplane;
 		private Plane bottomclipplane;
@@ -152,7 +151,7 @@ namespace CodeImp.DoomBuilder.BuilderModes
             // Determine if we should repeat the middle texture
             bool srb2repeat = General.Map.SRB2 && Sidedef.Line.IsFlagSet(General.Map.Config.RepeatMidtextureFlag);
             bool doomrepeat = !General.Map.SRB2 && Sidedef.IsFlagSet("wrapmidtex") || Sidedef.Line.IsFlagSet("wrapmidtex");
-            bool repeatmidtex = srb2repeat || doomrepeat;
+            repeatmidtex = srb2repeat || doomrepeat;
 
             //A little redundant, but having a separate boolean value for each case makes the code a little more readable
             bool srb2repeatfixed = srb2repeat && Sidedef.OffsetX >= 4096;