diff --git a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py
index fcbd0fc0a5..1087dc5822 100644
--- a/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py
+++ b/server_addon/aftereffects/client/ayon_aftereffects/plugins/load/load_file.py
@@ -24,6 +24,10 @@ class FileLoader(api.AfterEffectsLoader):
 
     def load(self, context, name=None, namespace=None, data=None):
         stub = self.get_stub()
+        selected_folders = stub.get_selected_items(
+            comps=False, folders=True, footages=False)
+        if selected_folders:
+            stub.select_items([folder.id for folder in selected_folders])
         layers = stub.get_items(comps=True, folders=True, footages=True)
         existing_layers = [layer.name for layer in layers]
         comp_name = get_unique_layer_name(
@@ -51,7 +55,6 @@ class FileLoader(api.AfterEffectsLoader):
 
         comp = stub.import_file(path, stub.LOADED_ICON + comp_name,
                                 import_options)
-
         if not comp:
             self.log.warning(
                 "Representation `{}` is failing to load".format(path))
@@ -60,7 +63,6 @@ class FileLoader(api.AfterEffectsLoader):
 
         self[:] = [comp]
         namespace = namespace or comp_name
-
         return api.containerise(
             name,
             namespace,
diff --git a/server_addon/aftereffects/package.py b/server_addon/aftereffects/package.py
index 8e4e70fc3b..37a54b4212 100644
--- a/server_addon/aftereffects/package.py
+++ b/server_addon/aftereffects/package.py
@@ -1,6 +1,6 @@
 name = "aftereffects"
 title = "AfterEffects"
-version = "0.2.0"
+version = "0.2.1"
 
 client_dir = "ayon_aftereffects"