diff --git a/openpype/hosts/fusion/scripts/fusion_switch_shot.py b/openpype/hosts/fusion/scripts/fusion_switch_shot.py
index ed6a06bb34..ca7efb9136 100644
--- a/openpype/hosts/fusion/scripts/fusion_switch_shot.py
+++ b/openpype/hosts/fusion/scripts/fusion_switch_shot.py
@@ -45,12 +45,6 @@ def _format_version_folder(folder):
     return version_folder
 
 
-def _get_work_folder(session):
-    """Convenience function to get the work folder path of the current asset"""
-    # Get new filename, create path based on asset and work template
-    return get_workdir_from_session(session)
-
-
 def _get_fusion_instance():
     fusion = getattr(sys.modules["__main__"], "fusion", None)
     if fusion is None:
@@ -69,7 +63,7 @@ def _format_filepath(session):
     asset = session["AVALON_ASSET"]
 
     # Save updated slap comp
-    work_path = _get_work_folder(session)
+    work_path = get_workdir_from_session(session)
     walk_to_dir = os.path.join(work_path, "scenes", "slapcomp")
     slapcomp_dir = os.path.abspath(walk_to_dir)
 
@@ -109,7 +103,7 @@ def _update_savers(comp, session):
          None
     """
 
-    new_work = _get_work_folder(session)
+    new_work = get_workdir_from_session(session)
     renders = os.path.join(new_work, "renders")
     version_folder = _format_version_folder(renders)
     renders_version = os.path.join(renders, version_folder)
diff --git a/openpype/hosts/fusion/utility_scripts/switch_ui.py b/openpype/hosts/fusion/utility_scripts/switch_ui.py
index 854c2fd415..afb39f7041 100644
--- a/openpype/hosts/fusion/utility_scripts/switch_ui.py
+++ b/openpype/hosts/fusion/utility_scripts/switch_ui.py
@@ -124,7 +124,7 @@ class App(QtWidgets.QWidget):
 
     def _on_open_from_dir(self):
 
-        start_dir = self._get_context_directory()
+        start_dir = get_workdir_from_session()
         comp_file, _ = QtWidgets.QFileDialog.getOpenFileName(
             self, "Choose comp", start_dir)
 
@@ -158,9 +158,6 @@ class App(QtWidgets.QWidget):
         import colorbleed.scripts.fusion_switch_shot as switch_shot
         switch_shot.switch(asset_name=asset, filepath=file_name, new=True)
 
-    def _get_context_directory(self):
-        return get_workdir_from_session(avalon.api.Session)
-
     def collect_slap_comps(self, directory):
         items = glob.glob("{}/*.comp".format(directory))
         return items
diff --git a/openpype/lib/avalon_context.py b/openpype/lib/avalon_context.py
index 9f6a9f9cdc..0bfd3f6de0 100644
--- a/openpype/lib/avalon_context.py
+++ b/openpype/lib/avalon_context.py
@@ -644,7 +644,7 @@ def get_workdir(
     )
 
 
-def template_data_from_session(session):
+def template_data_from_session(session=None):
     """ Return dictionary with template from session keys.
 
     Args:
@@ -654,6 +654,7 @@ def template_data_from_session(session):
         dict: All available data from session.
     """
     from avalon import io
+    import avalon.api
 
     if session is None:
         session = avalon.api.Session
@@ -742,7 +743,11 @@ def compute_session_changes(
     return changes
 
 
-def get_workdir_from_session(session, template_key=None):
+def get_workdir_from_session(session=None, template_key=None):
+    import avalon.api
+
+    if session is None:
+        session = avalon.api.Session
     project_name = session["AVALON_PROJECT"]
     host_name = session["AVALON_APP"]
     anatomy = Anatomy(project_name)
diff --git a/openpype/scripts/fusion_switch_shot.py b/openpype/scripts/fusion_switch_shot.py
index a8ac6812b5..6db8ff36a8 100644
--- a/openpype/scripts/fusion_switch_shot.py
+++ b/openpype/scripts/fusion_switch_shot.py
@@ -46,13 +46,6 @@ def _format_version_folder(folder):
     return version_folder
 
 
-def _get_work_folder(session):
-    """Convenience function to get the work folder path of the current asset"""
-
-    # Get new filename, create path based on asset and work template
-    return get_workdir_from_session(session)
-
-
 def _get_fusion_instance():
     fusion = getattr(sys.modules["__main__"], "fusion", None)
     if fusion is None:
@@ -71,7 +64,7 @@ def _format_filepath(session):
     asset = session["AVALON_ASSET"]
 
     # Save updated slap comp
-    work_path = _get_work_folder(session)
+    work_path = get_workdir_from_session(session)
     walk_to_dir = os.path.join(work_path, "scenes", "slapcomp")
     slapcomp_dir = os.path.abspath(walk_to_dir)
 
@@ -102,7 +95,7 @@ def _update_savers(comp, session):
          None
     """
 
-    new_work = _get_work_folder(session)
+    new_work = get_workdir_from_session(session)
     renders = os.path.join(new_work, "renders")
     version_folder = _format_version_folder(renders)
     renders_version = os.path.join(renders, version_folder)