diff --git a/openpype/modules/avalon_apps/avalon_app.py b/openpype/modules/avalon_apps/avalon_app.py
index 9e650a097e2..51a22323f19 100644
--- a/openpype/modules/avalon_apps/avalon_app.py
+++ b/openpype/modules/avalon_apps/avalon_app.py
@@ -13,14 +13,6 @@ def initialize(self, modules_settings):
 
         avalon_settings = modules_settings[self.name]
 
-        # Check if environment is already set
-        avalon_mongo_url = os.environ.get("AVALON_MONGO")
-        if not avalon_mongo_url:
-            avalon_mongo_url = avalon_settings["AVALON_MONGO"]
-        # Use pype mongo if Avalon's mongo not defined
-        if not avalon_mongo_url:
-            avalon_mongo_url = os.environ["OPENPYPE_MONGO"]
-
         thumbnail_root = os.environ.get("AVALON_THUMBNAIL_ROOT")
         if not thumbnail_root:
             thumbnail_root = avalon_settings["AVALON_THUMBNAIL_ROOT"]
@@ -31,7 +23,6 @@ def initialize(self, modules_settings):
             avalon_mongo_timeout = avalon_settings["AVALON_TIMEOUT"]
 
         self.thumbnail_root = thumbnail_root
-        self.avalon_mongo_url = avalon_mongo_url
         self.avalon_mongo_timeout = avalon_mongo_timeout
 
         # Tray attributes
@@ -51,12 +42,20 @@ def get_global_environments(self):
     def tray_init(self):
         # Add library tool
         try:
+            from Qt import QtCore
             from openpype.tools.libraryloader import LibraryLoaderWindow
 
-            self.libraryloader = LibraryLoaderWindow(
+            libraryloader = LibraryLoaderWindow(
                 show_projects=True,
                 show_libraries=True
             )
+            # Remove always on top flag for tray
+            window_flags = libraryloader.windowFlags()
+            if window_flags | QtCore.Qt.WindowStaysOnTopHint:
+                window_flags ^= QtCore.Qt.WindowStaysOnTopHint
+                libraryloader.setWindowFlags(window_flags)
+            self.libraryloader = libraryloader
+
         except Exception:
             self.log.warning(
                 "Couldn't load Library loader tool for tray.",
diff --git a/openpype/plugins/load/delivery.py b/openpype/plugins/load/delivery.py
index a8cb0070ee5..1037d6dc165 100644
--- a/openpype/plugins/load/delivery.py
+++ b/openpype/plugins/load/delivery.py
@@ -1,13 +1,13 @@
-from collections import defaultdict
 import copy
+from collections import defaultdict
 
 from Qt import QtWidgets, QtCore, QtGui
 
-from avalon import api, style
+from avalon import api
 from avalon.api import AvalonMongoDB
 
 from openpype.api import Anatomy, config
-from openpype import resources
+from openpype import resources, style
 
 from openpype.lib.delivery import (
     sizeof_fmt,
@@ -58,6 +58,18 @@ class DeliveryOptionsDialog(QtWidgets.QDialog):
     def __init__(self, contexts, log=None, parent=None):
         super(DeliveryOptionsDialog, self).__init__(parent=parent)
 
+        self.setWindowTitle("OpenPype - Deliver versions")
+        icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
+        self.setWindowIcon(icon)
+
+        self.setWindowFlags(
+            QtCore.Qt.WindowStaysOnTopHint
+            | QtCore.Qt.WindowCloseButtonHint
+            | QtCore.Qt.WindowMinimizeButtonHint
+        )
+
+        self.setStyleSheet(style.load_stylesheet())
+
         project = contexts[0]["project"]["name"]
         self.anatomy = Anatomy(project)
         self._representations = None
@@ -70,16 +82,6 @@ def __init__(self, contexts, log=None, parent=None):
 
         self._set_representations(contexts)
 
-        self.setWindowTitle("OpenPype - Deliver versions")
-        icon = QtGui.QIcon(resources.get_openpype_icon_filepath())
-        self.setWindowIcon(icon)
-
-        self.setWindowFlags(
-            QtCore.Qt.WindowCloseButtonHint |
-            QtCore.Qt.WindowMinimizeButtonHint
-        )
-        self.setStyleSheet(style.load_stylesheet())
-
         dropdown = QtWidgets.QComboBox()
         self.templates = self._get_templates(self.anatomy)
         for name, _ in self.templates.items():