diff --git a/addon.py b/addon.py
index 15ec479..111d3e9 100644
--- a/addon.py
+++ b/addon.py
@@ -204,7 +204,7 @@ def build_url(query):
             li.addContextMenuItems( commands )
 
             # Add listitem to directory
-            xbmcplugin.addDirectoryItem(handle=addon_handle, url=filename, listitem=li)
+            xbmcplugin.addDirectoryItem(handle=addon_handle, url=filename, listitem=li, isFolder=item.is_folder)
             count = count + 1
         xbmcplugin.endOfDirectory(addon_handle)
 
diff --git a/addon.xml b/addon.xml
index 6ad08e0..80594e2 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,10 +1,10 @@
 <?xml version="1.1" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.program.shortlist" name="Shortlist" version="0.0.11" provider-name="kcook98765">
+<addon id="plugin.program.shortlist" name="Shortlist" version="0.0.12" provider-name="Gothicawakening,kcook98765,krruzic">
   <requires>
     <import addon="xbmc.python" version="3.0.0"/>
   </requires>
   <extension point="xbmc.python.pluginsource" library="addon.py">
-    <provides>video</provides>
+    <provides>executable</provides>
   </extension>
   <extension point="xbmc.addon.metadata">
     <summary lang="en_gb">Shortlist movies to watch</summary>
@@ -26,10 +26,14 @@
   </extension>
   <extension point="kodi.context.item">
       <menu id="kodi.core.main">
-        <item library="capture.py">
+        <item library="capture.py" args="file">
             <label>30012</label>
-            <visible>[!String.IsEmpty(ListItem.DBID) + String.IsEqual(ListItem.DBType,movie)] | String.IsEqual(Container.Content,files)</visible>
+            <visible>!ListItem.IsFolder + !String.IsEqual(Container.PluginName,plugin.program.shortlist)</visible>
+        </item>
+        <item library="capture.py" args="folder">
+            <label>30014</label>
+            <visible>ListItem.IsFolder + !String.IsEqual(Container.PluginName,plugin.program.shortlist)</visible>
         </item>
       </menu>
-    </extension>
+  </extension>
 </addon>
diff --git a/capture.py b/capture.py
index 3ed28b9..0f4ffe2 100644
--- a/capture.py
+++ b/capture.py
@@ -31,9 +31,7 @@
 
 # if __name__ == '__main__':
 def main():
-
     lst = listDatabases()
-    # xbmc.log( "; ".join(lst), xbmc.LOGNOTICE);
 
     dialog = xbmcgui.Dialog()
     ret = dialog.contextmenu(lst)
@@ -64,6 +62,9 @@ def main():
         item.landscape = sys.listitem.getArt( 'landscape' )
         item.icon = sys.listitem.getArt( 'icon' )
 
+        if sys.argv[1] == "folder":
+            item.is_folder = True
+
         result = addItemToDatabase( dbName, item )
 
         if result:
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 554db02..9e6401c 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -66,4 +66,8 @@ msgstr "Add to Shortlist"
 
 msgctxt "#30013"
 msgid "Rename Shortlist"
-msgstr "Rename Shortlist"
\ No newline at end of file
+msgstr "Rename Shortlist"
+
+msgctxt "#30014"
+msgid "Add to Shortlist (directory)"
+msgstr "Add to Shortlist (directory)"
\ No newline at end of file
diff --git a/resources/language/resource.language.en_us/strings.po b/resources/language/resource.language.en_us/strings.po
index 554db02..9e6401c 100644
--- a/resources/language/resource.language.en_us/strings.po
+++ b/resources/language/resource.language.en_us/strings.po
@@ -66,4 +66,8 @@ msgstr "Add to Shortlist"
 
 msgctxt "#30013"
 msgid "Rename Shortlist"
-msgstr "Rename Shortlist"
\ No newline at end of file
+msgstr "Rename Shortlist"
+
+msgctxt "#30014"
+msgid "Add to Shortlist (directory)"
+msgstr "Add to Shortlist (directory)"
\ No newline at end of file
diff --git a/resources/language/resource.language.fr_fr/strings.po b/resources/language/resource.language.fr_fr/strings.po
index 07df0ec..16ab288 100644
--- a/resources/language/resource.language.fr_fr/strings.po
+++ b/resources/language/resource.language.fr_fr/strings.po
@@ -66,4 +66,8 @@ msgstr "Ajouter à la Shortlist"
 
 msgctxt "#30013"
 msgid "Rename Shortlist"
-msgstr "Renommer la Shortlist"
\ No newline at end of file
+msgstr "Renommer la Shortlist"
+
+msgctxt "#30014"
+msgid "Add to Shortlist"
+msgstr "Ajouter à la Shortlist (Répertoire)"
\ No newline at end of file
diff --git a/shortlistitem.py b/shortlistitem.py
index 90a9004..d8df3d8 100644
--- a/shortlistitem.py
+++ b/shortlistitem.py
@@ -16,4 +16,4 @@ class ShortlistItem:
     clearlogo = ""
     landscape = ""
     icon = "" 
-    
\ No newline at end of file
+    is_folder = False
\ No newline at end of file