diff --git a/themes/base.theme.bash b/themes/base.theme.bash
index 753d075d..6d32dc14 100644
--- a/themes/base.theme.bash
+++ b/themes/base.theme.bash
@@ -464,7 +464,16 @@ function aws_profile {
 }
 
 function safe_append_prompt_command {
-    local prompt_re="\<${1}\>" # exact match regex
+    local prompt_re
+
+    # Set OS dependent exact match regular expression
+    if [[ ${OSTYPE} == darwin* ]]; then
+      # macOS
+      prompt_re="[[:<:]]${1}[[:>:]]"
+    else
+      # Linux, FreeBSD, etc.
+      prompt_re="\<${1}\>"
+    fi
 
     if [[ ${PROMPT_COMMAND} =~ ${prompt_re} ]]; then
       return