diff --git a/src/public/app/desktop.js b/src/public/app/desktop.js
index 3ddd396a5..f1f7da792 100644
--- a/src/public/app/desktop.js
+++ b/src/public/app/desktop.js
@@ -9,6 +9,11 @@ import DesktopLayout from "./layouts/desktop_layout.js";
 import glob from "./services/glob.js";
 import zoomService from './services/zoom.js';
 
+bundleService.getWidgetBundlesByParent().then(widgetBundles => {
+    appContext.setLayout(new DesktopLayout(widgetBundles));
+    appContext.start();
+});
+
 glob.setupGlobs();
 
 if (utils.isElectron()) {
@@ -17,17 +22,8 @@ if (utils.isElectron()) {
     });
 }
 
-$('[data-toggle="tooltip"]').tooltip({
-    html: true
-});
-
 macInit.init();
 
-bundleService.getWidgetBundlesByParent().then(widgetBundles => {
-    appContext.setLayout(new DesktopLayout(widgetBundles));
-    appContext.start();
-});
-
 noteTooltipService.setupGlobalTooltip();
 
 noteAutocompleteService.init();
diff --git a/src/public/app/widgets/dialogs/import.js b/src/public/app/widgets/dialogs/import.js
index 087f48673..ddf86837a 100644
--- a/src/public/app/widgets/dialogs/import.js
+++ b/src/public/app/widgets/dialogs/import.js
@@ -115,6 +115,10 @@ export default class ImportDialog extends BasicWidget {
                 this.$importButton.attr("disabled", "disabled");
             }
         });
+
+        this.$widget.find('[data-toggle="tooltip"]').tooltip({
+            html: true
+        });
     }
 
     async showImportDialogEvent({noteId}) {