diff --git a/filepicker/filepicker.go b/filepicker/filepicker.go
index 2288a5d2..2645e91b 100644
--- a/filepicker/filepicker.go
+++ b/filepicker/filepicker.go
@@ -7,7 +7,7 @@ import (
 	"sort"
 	"strconv"
 	"strings"
-	"sync"
+	"sync/atomic"
 
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
@@ -15,17 +15,10 @@ import (
 	"github.com/dustin/go-humanize"
 )
 
-var (
-	lastID int
-	idMtx  sync.Mutex
-)
+var lastID uint64
 
-// Return the next ID we should use on the Model.
 func nextID() int {
-	idMtx.Lock()
-	defer idMtx.Unlock()
-	lastID++
-	return lastID
+	return int(atomic.AddUint64(&lastID, 1))
 }
 
 // New returns a new filepicker model with default styling and key bindings.
diff --git a/progress/progress.go b/progress/progress.go
index defa9813..f8e0d138 100644
--- a/progress/progress.go
+++ b/progress/progress.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 	"strings"
-	"sync"
+	"sync/atomic"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -17,17 +17,10 @@ import (
 
 // Internal ID management. Used during animating to assure that frame messages
 // can only be received by progress components that sent them.
-var (
-	lastID int
-	idMtx  sync.Mutex
-)
+var lastID uint64
 
-// Return the next ID we should use on the model.
 func nextID() int {
-	idMtx.Lock()
-	defer idMtx.Unlock()
-	lastID++
-	return lastID
+	return int(atomic.AddUint64(&lastID, 1))
 }
 
 const (
diff --git a/spinner/spinner.go b/spinner/spinner.go
index bb53597f..55fd55c1 100644
--- a/spinner/spinner.go
+++ b/spinner/spinner.go
@@ -1,7 +1,7 @@
 package spinner
 
 import (
-	"sync"
+	"sync/atomic"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
@@ -10,17 +10,10 @@ import (
 
 // Internal ID management. Used during animating to ensure that frame messages
 // are received only by spinner components that sent them.
-var (
-	lastID int
-	idMtx  sync.Mutex
-)
+var lastID uint64
 
-// Return the next ID we should use on the Model.
 func nextID() int {
-	idMtx.Lock()
-	defer idMtx.Unlock()
-	lastID++
-	return lastID
+	return int(atomic.AddUint64(&lastID, 1))
 }
 
 // Spinner is a set of frames used in animating the spinner.
diff --git a/stopwatch/stopwatch.go b/stopwatch/stopwatch.go
index 6b298f79..44d0ead2 100644
--- a/stopwatch/stopwatch.go
+++ b/stopwatch/stopwatch.go
@@ -2,22 +2,16 @@
 package stopwatch
 
 import (
-	"sync"
+	"sync/atomic"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-var (
-	lastID int
-	idMtx  sync.Mutex
-)
+var lastID uint64
 
 func nextID() int {
-	idMtx.Lock()
-	defer idMtx.Unlock()
-	lastID++
-	return lastID
+	return int(atomic.AddUint64(&lastID, 1))
 }
 
 // TickMsg is a message that is sent on every timer tick.
diff --git a/timer/timer.go b/timer/timer.go
index eb085e00..0dfb14f9 100644
--- a/timer/timer.go
+++ b/timer/timer.go
@@ -2,22 +2,16 @@
 package timer
 
 import (
-	"sync"
+	"sync/atomic"
 	"time"
 
 	tea "github.com/charmbracelet/bubbletea"
 )
 
-var (
-	lastID int
-	idMtx  sync.Mutex
-)
+var lastID uint64
 
 func nextID() int {
-	idMtx.Lock()
-	defer idMtx.Unlock()
-	lastID++
-	return lastID
+	return int(atomic.AddUint64(&lastID, 1))
 }
 
 // Authors note with regard to start and stop commands: