diff --git a/src/Framework/Framework/Binding/BindingHelper.cs b/src/Framework/Framework/Binding/BindingHelper.cs
index b69e947c37..f526626dfa 100644
--- a/src/Framework/Framework/Binding/BindingHelper.cs
+++ b/src/Framework/Framework/Binding/BindingHelper.cs
@@ -97,8 +97,15 @@ internal static (int stepsUp, DotvvmBindableObject target) FindDataContextTarget
                 {
                     // only count changes which are visible client-side
                     // server-side context are not present in the client-side stack at all, so we need to skip them here
-                    changes++;
-                    lastAncestorContext = ancestorContext;
+
+                    // don't count changes which only extend the data context, but don't nest it
+
+                    var isNesting = ancestorContext.IsAncestor(lastAncestorContext) || ancestorContext.DataContextType != lastAncestorContext.DataContextType;
+                    if (isNesting)
+                    {
+                        changes++;
+                        lastAncestorContext = ancestorContext;
+                    }
                 }
 
                 if (bindingContext.Equals(ancestorContext))
diff --git a/src/Framework/Framework/Compilation/ControlTree/DataContextStack.cs b/src/Framework/Framework/Compilation/ControlTree/DataContextStack.cs
index 36cf4ef486..89ca725582 100644
--- a/src/Framework/Framework/Compilation/ControlTree/DataContextStack.cs
+++ b/src/Framework/Framework/Compilation/ControlTree/DataContextStack.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
@@ -108,6 +108,21 @@ public IEnumerable<Type> Parents()
             }
         }
 
+        public bool IsAncestor(DataContextStack x)
+        {
+            var c = Parent;
+            while (c != null)
+            {
+                if (this.hashCode == x.hashCode)
+                {
+                    if (this.Equals(x))
+                        return true;
+                }
+                c = c.Parent;
+            }
+            return false;
+        }
+
         ITypeDescriptor IDataContextStack.DataContextType => new ResolvedTypeDescriptor(DataContextType);
         IDataContextStack? IDataContextStack.Parent => Parent;
 
diff --git a/src/Samples/Tests/Tests/Complex/TaskListTests.cs b/src/Samples/Tests/Tests/Complex/TaskListTests.cs
index 09fd44c01d..dd6e74735e 100644
--- a/src/Samples/Tests/Tests/Complex/TaskListTests.cs
+++ b/src/Samples/Tests/Tests/Complex/TaskListTests.cs
@@ -51,7 +51,7 @@ public void Complex_TaskList_ServerRenderedTaskList()
 
                 //add task
                 browser.SendKeys("input[type=text]", "DotVVM");
-                browser.Click("input[type=button]");
+                browser.Click("input[type=submit]");
 
                 browser.FindElements(".table tr").ThrowIfDifferentCountThan(4);
 
diff --git a/src/Tests/ControlTests/MarkupControlTests.cs b/src/Tests/ControlTests/MarkupControlTests.cs
index 1c34ed9b15..ee0dc8c46d 100644
--- a/src/Tests/ControlTests/MarkupControlTests.cs
+++ b/src/Tests/ControlTests/MarkupControlTests.cs
@@ -27,6 +27,7 @@ public class MarkupControlTests
             _ = Repeater.RenderAsNamedTemplateProperty;
             config.Resources.RegisterScriptModuleUrl("somemodule", "http://localhost:99999/somemodule.js", null);
             config.Markup.AddMarkupControl("cc", "CustomControl", "CustomControl.dotcontrol");
+            config.Markup.AddMarkupControl("cc", "CustomControlWithStaticCommand", "CustomControlWithStaticCommand.dotcontrol");
             config.Markup.AddMarkupControl("cc", "CustomControlWithCommand", "CustomControlWithCommand.dotcontrol");
             config.Markup.AddMarkupControl("cc", "CustomControlWithProperty", "CustomControlWithProperty.dotcontrol");
             config.Markup.AddMarkupControl("cc", "CustomControlWithInvalidVM", "CustomControlWithInvalidVM.dotcontrol");
@@ -68,14 +69,14 @@ public async Task MarkupControl_PassingStaticCommand()
         {
             var r = await cth.RunPage(typeof(BasicTestViewModel), @"
 
-                <cc:CustomControlWithCommand DataContext={value: Integer} Click={staticCommand: s.Save(_parent.Integer)} Another={value: _this} />
+                <cc:CustomControlWithStaticCommand DataContext={value: Integer} Click={staticCommand: s.Save(_parent.Integer)} Another={value: _this} />
                 <dot:Repeater DataSource={value: Collection}>
-                    <cc:CustomControlWithCommand Click={staticCommand: s.Save(_this)} Another={value: _root.Integer} />
+                    <cc:CustomControlWithStaticCommand Click={staticCommand: s.Save(_this)} Another={value: _root.Integer} />
                 </dot:Repeater>
                 ",
                 directives: $"@service s = {typeof(TestService)}",
                 markupFiles: new Dictionary<string, string> {
-                    ["CustomControlWithCommand.dotcontrol"] = @"
+                    ["CustomControlWithStaticCommand.dotcontrol"] = @"
                         @viewModel int
                         @baseType DotVVM.Framework.Tests.ControlTests.CustomControlWithCommand
                         @wrapperTag div
@@ -86,6 +87,30 @@ @wrapperTag div
             check.CheckString(r.FormattedHtml, fileExtension: "html");
         }
 
+        [TestMethod]
+        public async Task MarkupControl_CommandInRepeater()
+        {
+            var r = await cth.RunPage(typeof(BasicTestViewModel), @"
+
+                <cc:CustomControlWithCommand DataContext={value: Integer} Click={command: s.Save(_parent.Integer)} Another={value: _this} />
+                <dot:Repeater DataSource={value: Collection}>
+                    <cc:CustomControlWithCommand Click={command: s.Save(_this)} Another={value: _root.Integer} />
+                </dot:Repeater>
+                ",
+                directives: $"@service s = {typeof(TestService)}",
+                markupFiles: new Dictionary<string, string> {
+                    ["CustomControlWithCommand.dotcontrol"] = @"
+                        @viewModel int
+                        @baseType DotVVM.Framework.Tests.ControlTests.CustomControlWithCommand
+                        @wrapperTag div
+                        <dot:Button Click={command: _control.Click()} Text={resource: $'Button with number = {_control.Another}'} />"
+                }
+            );
+
+            check.CheckString(r.FormattedHtml, fileExtension: "html");
+        }
+
+
         [TestMethod]
         public async Task MarkupControl_UpdateSource()
         {
diff --git a/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BootstrapFormTest.html b/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BootstrapFormTest.html
index d1ce0979b8..dee9128e52 100644
--- a/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BootstrapFormTest.html
+++ b/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BootstrapFormTest.html
@@ -55,7 +55,7 @@
 				<ul data-bind="foreach: { data: $parent.Products()?.Items }" id="Products__input">
 					<li>
 						<label class="form-check-label">
-							<input class="form-check-input" data-bind="dotvvm-checkedItems: $parents[1].Products, checkedArrayContainsObservables: true, dotvvm-checkbox-updateAfterPostback: true, dotvvm-checked-pointer: 'dotvvm-checkedItems', checkedValue: Value" type="checkbox">
+							<input class="form-check-input" data-bind="dotvvm-checkedItems: $parent.Products, checkedArrayContainsObservables: true, dotvvm-checkbox-updateAfterPostback: true, dotvvm-checked-pointer: 'dotvvm-checkedItems', checkedValue: Value" type="checkbox">
 							<span data-bind="text: DisplayName"></span>
 						</label>
 					</li>
diff --git a/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BulmaFormTest.html b/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BulmaFormTest.html
index b8d04c80b1..f3baa8b0f7 100644
--- a/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BulmaFormTest.html
+++ b/src/Tests/ControlTests/testoutputs/AutoUIFormTests.BulmaFormTest.html
@@ -86,7 +86,7 @@
 						<ul data-bind="dotvvm-validation: Products, dotvvm-validationOptions: { invalidCssClass: &quot;is-danger&quot;, setToolTipText: true }, foreach: { data: $parent.Products()?.Items }" id="Products__input">
 							<li>
 								<label class="checkbox">
-									<input data-bind="dotvvm-checkedItems: $parents[1].Products, checkedArrayContainsObservables: true, dotvvm-checkbox-updateAfterPostback: true, dotvvm-checked-pointer: 'dotvvm-checkedItems', checkedValue: Value" type="checkbox">
+									<input data-bind="dotvvm-checkedItems: $parent.Products, checkedArrayContainsObservables: true, dotvvm-checkbox-updateAfterPostback: true, dotvvm-checked-pointer: 'dotvvm-checkedItems', checkedValue: Value" type="checkbox">
 									<span data-bind="text: DisplayName"></span>
 								</label>
 							</li>
diff --git a/src/Tests/ControlTests/testoutputs/AutoUITests.Selections.html b/src/Tests/ControlTests/testoutputs/AutoUITests.Selections.html
index 87e42b4833..5312ed3ff8 100644
--- a/src/Tests/ControlTests/testoutputs/AutoUITests.Selections.html
+++ b/src/Tests/ControlTests/testoutputs/AutoUITests.Selections.html
@@ -29,7 +29,7 @@
 						<ul data-bind="foreach: { data: $parent.Countries()?.Items }" id="CountryId__input">
 							<li>
 								<label>
-									<input data-bind="dotvvm-checkedItems: $parents[1].CountryId, checkedArrayContainsObservables: true, dotvvm-checkbox-updateAfterPostback: true, dotvvm-checked-pointer: 'dotvvm-checkedItems', checkedValue: Value" type="checkbox">
+									<input data-bind="dotvvm-checkedItems: $parent.CountryId, checkedArrayContainsObservables: true, dotvvm-checkbox-updateAfterPostback: true, dotvvm-checked-pointer: 'dotvvm-checkedItems', checkedValue: Value" type="checkbox">
 									<span data-bind="text: DisplayName"></span>
 								</label>
 							</li>
diff --git a/src/Tests/ControlTests/testoutputs/MarkupControlTests.MarkupControl_CommandInRepeater.html b/src/Tests/ControlTests/testoutputs/MarkupControlTests.MarkupControl_CommandInRepeater.html
new file mode 100644
index 0000000000..76be887516
--- /dev/null
+++ b/src/Tests/ControlTests/testoutputs/MarkupControlTests.MarkupControl_CommandInRepeater.html
@@ -0,0 +1,16 @@
+<html>
+	<head></head>
+	<body>
+		
+		<!-- ko with: int -->
+		<div>
+			<input onclick="dotvvm.postBack(this,[&quot;$parent.int&quot;],&quot;A0nd+6BTPk/xOJQH&quot;,&quot;c7&quot;,null,[],[],undefined).catch(dotvvm.log.logPostBackScriptError);event.stopPropagation();return false;" type="button" value="Button with number = 10000000">
+		</div>
+		<!-- /ko -->
+		<div data-bind="foreach: { data: Collection }">
+			<div>
+				<input onclick="dotvvm.postBack(this,[&quot;Collection/[$index]&quot;],&quot;A0nd+6BTPk/xOJQH&quot;,&quot;c9&quot;+'_'+ko.contextFor(this).$index()+'_'+&quot;c11&quot;,null,[],[],undefined).catch(dotvvm.log.logPostBackScriptError);event.stopPropagation();return false;" type="button" value="Button with number = 10000000">
+			</div>
+		</div>
+	</body>
+</html>