diff --git a/Cargo.lock b/Cargo.lock
index 6ffca98f..66037a1f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1919,6 +1919,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-live"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1927,6 +1928,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-wasm-bridge"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -1934,6 +1936,7 @@ dependencies = [
 [[package]]
 name = "makepad-derive-widget"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-proc-macro",
@@ -1942,6 +1945,7 @@ dependencies = [
 [[package]]
 name = "makepad-draw"
 version = "0.6.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "ab_glyph_rasterizer",
  "fxhash",
@@ -1958,14 +1962,17 @@ dependencies = [
 [[package]]
 name = "makepad-futures"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 
 [[package]]
 name = "makepad-futures-legacy"
 version = "0.7.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 
 [[package]]
 name = "makepad-html"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-id",
 ]
@@ -1973,6 +1980,7 @@ dependencies = [
 [[package]]
 name = "makepad-http"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 
 [[package]]
 name = "makepad-jni-sys"
@@ -1983,6 +1991,7 @@ checksum = "9775cbec5fa0647500c3e5de7c850280a88335d1d2d770e5aa2332b801ba7064"
 [[package]]
 name = "makepad-live-compiler"
 version = "0.5.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-derive-live",
  "makepad-live-tokenizer",
@@ -1992,6 +2001,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-id-macros",
 ]
@@ -1999,6 +2009,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-id-macros"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2006,6 +2017,7 @@ dependencies = [
 [[package]]
 name = "makepad-live-tokenizer"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-id",
  "makepad-math",
@@ -2015,6 +2027,7 @@ dependencies = [
 [[package]]
 name = "makepad-markdown"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-id",
 ]
@@ -2022,14 +2035,17 @@ dependencies = [
 [[package]]
 name = "makepad-math"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 
 [[package]]
 name = "makepad-micro-proc-macro"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 
 [[package]]
 name = "makepad-micro-serde"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-id",
  "makepad-micro-serde-derive",
@@ -2038,6 +2054,7 @@ dependencies = [
 [[package]]
 name = "makepad-micro-serde-derive"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-micro-proc-macro",
 ]
@@ -2045,10 +2062,12 @@ dependencies = [
 [[package]]
 name = "makepad-objc-sys"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 
 [[package]]
 name = "makepad-platform"
 version = "0.6.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "hilog-sys",
  "makepad-android-state",
@@ -2071,6 +2090,7 @@ dependencies = [
 [[package]]
 name = "makepad-rustybuzz"
 version = "0.8.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "bitflags 1.3.2",
  "bytemuck",
@@ -2085,6 +2105,7 @@ dependencies = [
 [[package]]
 name = "makepad-shader-compiler"
 version = "0.5.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-live-compiler",
 ]
@@ -2092,6 +2113,7 @@ dependencies = [
 [[package]]
 name = "makepad-vector"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "resvg",
  "ttf-parser",
@@ -2100,6 +2122,7 @@ dependencies = [
 [[package]]
 name = "makepad-wasm-bridge"
 version = "0.4.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-derive-wasm-bridge",
  "makepad-live-id",
@@ -2108,6 +2131,7 @@ dependencies = [
 [[package]]
 name = "makepad-widgets"
 version = "0.6.0"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-derive-widget",
  "makepad-draw",
@@ -2121,6 +2145,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-core"
 version = "0.2.14"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -2128,6 +2153,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-inflate"
 version = "0.2.54"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "simd-adler32",
 ]
@@ -2135,6 +2161,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-jpeg"
 version = "0.3.17"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-zune-core",
 ]
@@ -2142,6 +2169,7 @@ dependencies = [
 [[package]]
 name = "makepad-zune-png"
 version = "0.2.1"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 dependencies = [
  "makepad-zune-core",
  "makepad-zune-inflate",
@@ -4167,6 +4195,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "ttf-parser"
 version = "0.21.1"
+source = "git+https://github.com/kevinaboos/makepad?branch=portal_list_fix_at_end#1359b5c0e0c9e72fc7b990878e7d0b08eb047224"
 
 [[package]]
 name = "typenum"
diff --git a/Cargo.toml b/Cargo.toml
index 611883e3..ea539309 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,7 @@ version = "0.0.1-pre-alpha"
 metadata.makepad-auto-version = "zqpv-Yj-K7WNVK2I8h5Okhho46Q="
 
 [dependencies]
-# makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "widget_uid_hashable" }
-makepad-widgets = { path = "../makepad/widgets" }
+makepad-widgets = { git = "https://github.com/kevinaboos/makepad", branch = "portal_list_fix_at_end" }
 
 ## Including this crate automatically configures all `robius-*` crates to work with Makepad.
 robius-use-makepad = "0.1.1"