diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
index 6e386ca3..6a02bccd 100644
--- a/resources/language/resource.language.en_gb/strings.po
+++ b/resources/language/resource.language.en_gb/strings.po
@@ -941,3 +941,7 @@ msgstr ""
 msgctxt "#33193"
 msgid "Restarting..."
 msgstr ""
+
+msgctxt "#33194"
+msgid "Manage libraries"
+msgstr ""
diff --git a/resources/lib/entrypoint/default.py b/resources/lib/entrypoint/default.py
index 6915a22b..72253257 100644
--- a/resources/lib/entrypoint/default.py
+++ b/resources/lib/entrypoint/default.py
@@ -119,6 +119,8 @@ class Events(object):
             event('UpdateServer')
         elif mode == 'thememedia':
             get_themes()
+        elif mode == 'managelibs':
+            manage_libraries()
         elif mode == 'backup':
             backup()
         elif mode == 'restartservice':
@@ -184,15 +186,10 @@ def listing():
             directory(server['Name'], "plugin://plugin.video.emby/?mode=browse&server=%s" % server['Id'], context=context)
 
 
+    directory(_(33194), "plugin://plugin.video.emby/?mode=managelibs", True)
     directory(_(33134), "plugin://plugin.video.emby/?mode=addserver", False)
-    directory(_(5), "plugin://plugin.video.emby/?mode=settings", False)
     directory(_(33054), "plugin://plugin.video.emby/?mode=adduser", False)
-    directory(_(33098), "plugin://plugin.video.emby/?mode=refreshboxsets", False)
-    directory(_(33154), "plugin://plugin.video.emby/?mode=addlibs", False)
-    directory(_(33139), "plugin://plugin.video.emby/?mode=updatelibs", False)
-    directory(_(33140), "plugin://plugin.video.emby/?mode=repairlibs", False)
-    directory(_(33184), "plugin://plugin.video.emby/?mode=removelibs", False)
-    directory(_(33060), "plugin://plugin.video.emby/?mode=thememedia", False)
+    directory(_(5), "plugin://plugin.video.emby/?mode=settings", False)
     directory(_(33058), "plugin://plugin.video.emby/?mode=reset", False)
     directory(_(33192), "plugin://plugin.video.emby/?mode=restartservice", False)
 
@@ -226,6 +223,18 @@ def dir_listitem(label, path, artwork=None, fanart=None):
 
     return li
 
+def manage_libraries():
+
+    directory(_(33098), "plugin://plugin.video.emby/?mode=refreshboxsets", False)
+    directory(_(33154), "plugin://plugin.video.emby/?mode=addlibs", False)
+    directory(_(33139), "plugin://plugin.video.emby/?mode=updatelibs", False)
+    directory(_(33140), "plugin://plugin.video.emby/?mode=repairlibs", False)
+    directory(_(33184), "plugin://plugin.video.emby/?mode=removelibs", False)
+    directory(_(33060), "plugin://plugin.video.emby/?mode=thememedia", False)
+
+    xbmcplugin.setContent(int(sys.argv[1]), 'files')
+    xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
 def browse(media, view_id=None, folder=None, server_id=None):
 
     ''' Browse content dynamically.