diff --git a/ui/widgets/gridview.go b/ui/widgets/gridview.go
index 8990cd8..db749eb 100644
--- a/ui/widgets/gridview.go
+++ b/ui/widgets/gridview.go
@@ -51,7 +51,7 @@ type GridView struct {
 
 	GridViewState
 
-	grid *widget.GridWrapList
+	grid *GridWrap
 }
 
 type GridViewState struct {
@@ -83,7 +83,7 @@ func NewFixedGridView(items []GridViewItemModel, fetch ImageFetcher) *GridView {
 		},
 	}
 	g.ExtendBaseWidget(g)
-	g.createGridWrapList()
+	g.createGridWrap()
 	return g
 }
 
@@ -96,7 +96,7 @@ func NewGridView(iter GridViewIterator, fetch ImageFetcher) *GridView {
 	}
 	g.ExtendBaseWidget(g)
 
-	g.createGridWrapList()
+	g.createGridWrap()
 
 	// fetch initial items
 	g.fetchMoreItems(36)
@@ -112,7 +112,7 @@ func (g *GridView) SaveToState() GridViewState {
 func NewGridViewFromState(state GridViewState) *GridView {
 	g := &GridView{GridViewState: state}
 	g.ExtendBaseWidget(g)
-	g.createGridWrapList()
+	g.createGridWrap()
 	g.Refresh() // needed to initialize the widget
 	g.grid.ScrollToOffset(state.scrollPos)
 	return g
@@ -146,8 +146,8 @@ func (g *GridView) ResetFixed(items []GridViewItemModel) {
 	g.iter = nil
 }
 
-func (g *GridView) createGridWrapList() {
-	g.grid = widget.NewGridWrapList(
+func (g *GridView) createGridWrap() {
+	g.grid = NewGridWrap(
 		func() int {
 			return g.lenItems()
 		},
@@ -182,9 +182,9 @@ func (g *GridView) createGridWrapList() {
 			return card
 		},
 		// update func
-		func(itemID int, obj fyne.CanvasObject) {
+		func(itemID GridWrapItemID, obj fyne.CanvasObject) {
 			ac := obj.(*GridViewItem)
-			g.doUpdateItemCard(itemID, ac)
+			g.doUpdateItemCard(int(itemID), ac)
 		},
 	)
 }
diff --git a/ui/widgets/gridwrap.go b/ui/widgets/gridwrap.go
new file mode 100644
index 0000000..5940c2a
--- /dev/null
+++ b/ui/widgets/gridwrap.go
@@ -0,0 +1,351 @@
+// TODO: remove this file once https://github.com/fyne-io/fyne-x/pull/56 lands in fyne-x
+// and use the fyne-x version.
+package widgets
+
+import (
+	"fmt"
+	"math"
+	"sync"
+
+	"fyne.io/fyne/v2"
+	"fyne.io/fyne/v2/canvas"
+	"fyne.io/fyne/v2/container"
+	"fyne.io/fyne/v2/data/binding"
+	"fyne.io/fyne/v2/theme"
+	"fyne.io/fyne/v2/widget"
+)
+
+// Declare conformity with Widget interface.
+var _ fyne.Widget = (*GridWrap)(nil)
+
+// GridWrapItemID is the ID of an individual item in the GridWrap widget.
+type GridWrapItemID int
+
+// GridWrap is a widget with an API very similar to widget.List,
+// that lays out items in a scrollable wrapping grid similar to container.NewGridWrap.
+// It caches and reuses widgets for performance.
+type GridWrap struct {
+	widget.BaseWidget
+
+	Length     func() int                                      `json:"-"`
+	CreateItem func() fyne.CanvasObject                        `json:"-"`
+	UpdateItem func(id GridWrapItemID, item fyne.CanvasObject) `json:"-"`
+
+	scroller      *container.Scroll
+	itemMin       fyne.Size
+	offsetY       float32
+	offsetUpdated func(fyne.Position)
+}
+
+// NewGridWrap creates and returns a GridWrap widget for displaying items in
+// a wrapping grid layout with scrolling and caching for performance.
+func NewGridWrap(length func() int, createItem func() fyne.CanvasObject, updateItem func(GridWrapItemID, fyne.CanvasObject)) *GridWrap {
+	gwList := &GridWrap{Length: length, CreateItem: createItem, UpdateItem: updateItem}
+	gwList.ExtendBaseWidget(gwList)
+	return gwList
+}
+
+// NewGridWrapWithData creates a new GridWrap widget that will display the contents of the provided data.
+func NewGridWrapWithData(data binding.DataList, createItem func() fyne.CanvasObject, updateItem func(binding.DataItem, fyne.CanvasObject)) *GridWrap {
+	gwList := NewGridWrap(
+		data.Length,
+		createItem,
+		func(i GridWrapItemID, o fyne.CanvasObject) {
+			item, err := data.GetItem(int(i))
+			if err != nil {
+				fyne.LogError(fmt.Sprintf("Error getting data item %d", i), err)
+				return
+			}
+			updateItem(item, o)
+		})
+
+	data.AddListener(binding.NewDataListener(gwList.Refresh))
+	return gwList
+}
+
+// CreateRenderer is a private method to Fyne which links this widget to its renderer.
+func (l *GridWrap) CreateRenderer() fyne.WidgetRenderer {
+	l.ExtendBaseWidget(l)
+
+	if f := l.CreateItem; f != nil {
+		if l.itemMin.IsZero() {
+			l.itemMin = f().MinSize()
+		}
+	}
+	layout := &fyne.Container{Layout: newGridWrapLayout(l)}
+	l.scroller = container.NewVScroll(layout)
+	layout.Resize(layout.MinSize())
+
+	return newGridWrapRenderer([]fyne.CanvasObject{l.scroller}, l, l.scroller, layout)
+}
+
+// MinSize returns the size that this widget should not shrink below.
+func (l *GridWrap) MinSize() fyne.Size {
+	l.ExtendBaseWidget(l)
+
+	return l.BaseWidget.MinSize()
+}
+
+func (l *GridWrap) scrollTo(id GridWrapItemID) {
+	if l.scroller == nil {
+		return
+	}
+	row := math.Floor(float64(id) / float64(l.getColCount()))
+	y := float32(row)*l.itemMin.Height + float32(row)*theme.Padding()
+	if y < l.scroller.Offset.Y {
+		l.scroller.Offset.Y = y
+	} else if y+l.itemMin.Height > l.scroller.Offset.Y+l.scroller.Size().Height {
+		l.scroller.Offset.Y = y + l.itemMin.Height - l.scroller.Size().Height
+	}
+	l.offsetUpdated(l.scroller.Offset)
+}
+
+// Resize is called when this GridWrap should change size. We refresh to ensure invisible items are drawn.
+func (l *GridWrap) Resize(s fyne.Size) {
+	l.BaseWidget.Resize(s)
+	l.offsetUpdated(l.scroller.Offset)
+	l.scroller.Content.(*fyne.Container).Layout.(*gridWrapLayout).updateList(true)
+}
+
+// ScrollTo scrolls to the item represented by id
+func (l *GridWrap) ScrollTo(id GridWrapItemID) {
+	length := 0
+	if f := l.Length; f != nil {
+		length = f()
+	}
+	if id < 0 || int(id) >= length {
+		return
+	}
+	l.scrollTo(id)
+	l.Refresh()
+}
+
+// ScrollToBottom scrolls to the end of the list
+func (l *GridWrap) ScrollToBottom() {
+	length := 0
+	if f := l.Length; f != nil {
+		length = f()
+	}
+	if length > 0 {
+		length--
+	}
+	l.scrollTo(GridWrapItemID(length))
+	l.Refresh()
+}
+
+// ScrollToTop scrolls to the start of the list
+func (l *GridWrap) ScrollToTop() {
+	l.scrollTo(0)
+	l.Refresh()
+}
+
+// ScrollToOffset scrolls the list to the given offset position
+func (l *GridWrap) ScrollToOffset(offset float32) {
+	l.scroller.Offset.Y = offset
+	l.offsetUpdated(l.scroller.Offset)
+}
+
+// GetScrollOffset returns the current scroll offset position
+func (l *GridWrap) GetScrollOffset() float32 {
+	return l.offsetY
+}
+
+// Declare conformity with WidgetRenderer interface.
+var _ fyne.WidgetRenderer = (*gridWrapRenderer)(nil)
+
+type gridWrapRenderer struct {
+	objects []fyne.CanvasObject
+
+	list     *GridWrap
+	scroller *container.Scroll
+	layout   *fyne.Container
+}
+
+func newGridWrapRenderer(objects []fyne.CanvasObject, l *GridWrap, scroller *container.Scroll, layout *fyne.Container) *gridWrapRenderer {
+	lr := &gridWrapRenderer{objects: objects, list: l, scroller: scroller, layout: layout}
+	lr.scroller.OnScrolled = l.offsetUpdated
+	return lr
+}
+
+func (l *gridWrapRenderer) Layout(size fyne.Size) {
+	l.scroller.Resize(size)
+}
+
+func (l *gridWrapRenderer) MinSize() fyne.Size {
+	return l.scroller.MinSize().Max(l.list.itemMin)
+}
+
+func (l *gridWrapRenderer) Refresh() {
+	if f := l.list.CreateItem; f != nil {
+		l.list.itemMin = f().MinSize()
+	}
+	l.Layout(l.list.Size())
+	l.scroller.Refresh()
+	l.layout.Layout.(*gridWrapLayout).updateList(true)
+	canvas.Refresh(l.list)
+}
+
+func (l *gridWrapRenderer) Destroy() {
+}
+
+func (l *gridWrapRenderer) Objects() []fyne.CanvasObject {
+	return l.objects
+}
+
+// Declare conformity with Layout interface.
+var _ fyne.Layout = (*gridWrapLayout)(nil)
+
+type gridWrapLayout struct {
+	list     *GridWrap
+	children []fyne.CanvasObject
+
+	itemPool   *syncPool
+	visible    map[GridWrapItemID]fyne.CanvasObject
+	renderLock sync.Mutex
+}
+
+func newGridWrapLayout(list *GridWrap) fyne.Layout {
+	l := &gridWrapLayout{list: list, itemPool: &syncPool{}, visible: make(map[GridWrapItemID]fyne.CanvasObject)}
+	list.offsetUpdated = l.offsetUpdated
+	return l
+}
+
+func (l *gridWrapLayout) Layout([]fyne.CanvasObject, fyne.Size) {
+	l.updateList(true)
+}
+
+func (l *gridWrapLayout) MinSize([]fyne.CanvasObject) fyne.Size {
+	if lenF := l.list.Length; lenF != nil {
+		cols := l.list.getColCount()
+		rows := float32(math.Ceil(float64(lenF()) / float64(cols)))
+		return fyne.NewSize(l.list.itemMin.Width,
+			(l.list.itemMin.Height+theme.Padding())*rows-theme.Padding())
+	}
+	return fyne.NewSize(0, 0)
+}
+
+func (l *gridWrapLayout) getItem() fyne.CanvasObject {
+	item := l.itemPool.Obtain()
+	if item == nil {
+		if f := l.list.CreateItem; f != nil {
+			item = f()
+		}
+	}
+	return item
+}
+
+func (l *gridWrapLayout) offsetUpdated(pos fyne.Position) {
+	if l.list.offsetY == pos.Y {
+		return
+	}
+	l.list.offsetY = pos.Y
+	l.updateList(false)
+}
+
+func (l *gridWrapLayout) setupListItem(li fyne.CanvasObject, id GridWrapItemID) {
+	if f := l.list.UpdateItem; f != nil {
+		f(id, li)
+	}
+}
+
+func (l *GridWrap) getColCount() int {
+	colCount := 1
+	width := l.Size().Width
+	if width > l.itemMin.Width {
+		colCount = int(math.Floor(float64(width+theme.Padding()) / float64(l.itemMin.Width+theme.Padding())))
+	}
+	return colCount
+}
+
+func (l *gridWrapLayout) updateList(refresh bool) {
+	// code here is a mashup of listLayout.updateList and gridWrapLayout.Layout
+
+	l.renderLock.Lock()
+	defer l.renderLock.Unlock()
+	length := 0
+	if f := l.list.Length; f != nil {
+		length = f()
+	}
+
+	colCount := l.list.getColCount()
+	visibleRowsCount := int(math.Ceil(float64(l.list.scroller.Size().Height)/float64(l.list.itemMin.Height+theme.Padding()))) + 1
+
+	offY := l.list.offsetY - float32(math.Mod(float64(l.list.offsetY), float64(l.list.itemMin.Height+theme.Padding())))
+	minRow := int(offY / (l.list.itemMin.Height + theme.Padding()))
+	minItem := GridWrapItemID(minRow * colCount)
+	maxRow := int(math.Min(float64(minRow+visibleRowsCount), math.Ceil(float64(length)/float64(colCount))))
+	maxItem := GridWrapItemID(math.Min(float64(maxRow*colCount), float64(length-1)))
+
+	if l.list.UpdateItem == nil {
+		fyne.LogError("Missing UpdateCell callback required for GridWrap", nil)
+	}
+
+	wasVisible := l.visible
+	l.visible = make(map[GridWrapItemID]fyne.CanvasObject)
+	var cells []fyne.CanvasObject
+	y := offY
+	curItem := minItem
+	for row := minRow; row <= maxRow && curItem <= maxItem; row++ {
+		x := float32(0)
+		for col := 0; col < colCount && curItem <= maxItem; col++ {
+			c, ok := wasVisible[curItem]
+			if !ok {
+				c = l.getItem()
+				if c == nil {
+					continue
+				}
+				c.Resize(l.list.itemMin)
+				l.setupListItem(c, curItem)
+			}
+
+			c.Move(fyne.NewPos(x, y))
+			if refresh {
+				c.Resize(l.list.itemMin)
+				if ok { // refresh visible
+					l.setupListItem(c, curItem)
+				}
+			}
+
+			x += l.list.itemMin.Width + theme.Padding()
+			l.visible[curItem] = c
+			cells = append(cells, c)
+			curItem++
+		}
+		y += l.list.itemMin.Height + theme.Padding()
+	}
+
+	for id, old := range wasVisible {
+		if _, ok := l.visible[id]; !ok {
+			l.itemPool.Release(old)
+		}
+	}
+	l.children = cells
+
+	objects := l.children
+	l.list.scroller.Content.(*fyne.Container).Objects = objects
+}
+
+type pool interface {
+	Obtain() fyne.CanvasObject
+	Release(fyne.CanvasObject)
+}
+
+var _ pool = (*syncPool)(nil)
+
+type syncPool struct {
+	sync.Pool
+}
+
+// Obtain returns an item from the pool for use
+func (p *syncPool) Obtain() (item fyne.CanvasObject) {
+	o := p.Get()
+	if o != nil {
+		item = o.(fyne.CanvasObject)
+	}
+	return
+}
+
+// Release adds an item into the pool to be used later
+func (p *syncPool) Release(item fyne.CanvasObject) {
+	p.Put(item)
+}