diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66926aa..2463ff9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 - Calendar is hidden if the selected interval is larger than 31 days.
 - The "clarity view" groups columns by day/week/month/year, depending on the selected interval. Selecting large intervals is useful to see the total booked time to a particular account.
+- Fixed: GUESS-Button: `FOO-11` no longer matches clarity-task containing `FOO-111`.
 
 ## [2.5.0] - 2020-07-12
 
diff --git a/zedd-app/src/components/TaskEditor.tsx b/zedd-app/src/components/TaskEditor.tsx
index be7475f..2e9e442 100644
--- a/zedd-app/src/components/TaskEditor.tsx
+++ b/zedd-app/src/components/TaskEditor.tsx
@@ -66,8 +66,10 @@ export const TaskEditor = observer(
     let guessClarityIntId: number | undefined = undefined
     if (value.clarityTaskIntId === undefined) {
       const keys = value.name.match(/[A-Z]+-\d+/g) ?? []
-      guessClarityIntId = clarityState.tasks.find((ct) => keys.some((key) => ct.name.includes(key)))
-        ?.intId
+      const keyRegexes = keys.map((key) => new RegExp(key + '(?!\\d)'))
+      guessClarityIntId = clarityState.tasks.find((ct) =>
+        keyRegexes.some((regex) => ct.name.match(regex)),
+      )?.intId
     }
 
     return (