diff --git a/app/src/main/java/org/xbmc/kore/ui/AddonOverviewFragment.java b/app/src/main/java/org/xbmc/kore/ui/AddonOverviewFragment.java
index 47a4166..4ab8dd0 100644
--- a/app/src/main/java/org/xbmc/kore/ui/AddonOverviewFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/AddonOverviewFragment.java
@@ -85,6 +85,7 @@ public class AddonOverviewFragment extends Fragment {
         MediaFileListFragment.FileLocation rootPath = new MediaFileListFragment.FileLocation(name, "plugin://" + path, true);
         rootPath.setRootDir(true);
         content.putParcelable(MediaFileListFragment.ROOT_PATH, rootPath);
+        content.putBoolean(MediaFileListFragment.DELAY_LOAD, true);
         return content;
     }
 
diff --git a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
index 20d7803..e180b0c 100644
--- a/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
+++ b/app/src/main/java/org/xbmc/kore/ui/MediaFileListFragment.java
@@ -65,6 +65,7 @@ public class MediaFileListFragment extends AbstractListFragment {
     public static final String ROOT_PATH_CONTENTS = "rootPathContents";
     public static final String ROOT_VISITED = "rootVisited";
     public static final String ROOT_PATH = "rootPath";
+    public static final String DELAY_LOAD = "delayLoad";
     private static final String ADDON_SOURCE = "addons:";
 
     private HostManager hostManager;
@@ -165,7 +166,7 @@ public class MediaFileListFragment extends AbstractListFragment {
         else if (rootPath != null) {
             loadOnVisible = rootPath;
             // setUserVisibleHint may have already fired
-            setUserVisibleHint(getUserVisibleHint());
+            setUserVisibleHint(getUserVisibleHint() || !args.getBoolean(DELAY_LOAD, false));
         }
         else {
             browseSources();