diff --git a/lua/taglinks/tagutils.lua b/lua/taglinks/tagutils.lua
index 6d1efb2..54a1f3f 100644
--- a/lua/taglinks/tagutils.lua
+++ b/lua/taglinks/tagutils.lua
@@ -82,13 +82,13 @@ local function yaml_to_tags(line, entry, ret)
     local prev_i = 1
     local tag
     while true do
-        i, j = line:find("%s*.*%s*,", i)
+        i, j = line:find("%s*(%S*)%s*,", i)
         if i == nil then
             tag = line:sub(prev_i)
-            tag = tag:gsub("%s*(.*)%s*", "%1")
+            tag = tag:gsub("%s*(%S*)%s*", "%1")
         else
             tag = line:sub(i, j)
-            tag = tag:gsub("%s*(.*)%s*,", "%1")
+            tag = tag:gsub("%s*(%S*)%s*,", "%1")
         end
 
         local new_entry = {}