diff --git a/files/ZAZFavorites_v0.6.0.oxt b/files/ZAZFavorites_v0.6.0.oxt
index cf7155f..3fd6405 100644
Binary files a/files/ZAZFavorites_v0.6.0.oxt and b/files/ZAZFavorites_v0.6.0.oxt differ
diff --git a/source/pythonpath/main.py b/source/pythonpath/main.py
index afb03f5..5b5401b 100644
--- a/source/pythonpath/main.py
+++ b/source/pythonpath/main.py
@@ -41,9 +41,11 @@ class Controllers(object):
 
         base = f'service:{ID_EXTENSION}?{{}}'
         submenus = []
-        for i, path in enumerate(self.paths):
-            p = app.paths(path)
-            label = f'{i+1}. {p.file_name}'
+        for i in range(self.d.grid.row_count):
+            name = self.d.grid[0, i]
+            path = self.d.grid[2, i]
+            label = f'{i+1}. {name}'
+            path = app.paths.join(path, name)
             url = app.paths.to_url(path)
             sm = {'Label': label, 'CommandURL': base.format(url)}
             submenus.append(sm)