diff --git a/src/blackgui/components/navigatordialog.cpp b/src/blackgui/components/navigatordialog.cpp
index d4f364fb5..89de68ffd 100644
--- a/src/blackgui/components/navigatordialog.cpp
+++ b/src/blackgui/components/navigatordialog.cpp
@@ -173,6 +173,7 @@ namespace BlackGui
 
         void CNavigatorDialog::onStyleSheetsChanged()
         {
+            if (!sGui || sGui->isShuttingDown()) { return; }
             const QString fn(CStyleSheetUtility::fileNameNavigator());
             const QString qss(sGui->getStyleSheetUtility().style(fn));
             this->setStyleSheet("");
@@ -190,7 +191,8 @@ namespace BlackGui
             {
                 if (event->buttons() & Qt::LeftButton)
                 {
-                    this->move(event->globalPos() - m_framelessDragPosition);
+                    const QPoint pos = this->mapToParent(event->pos() - m_framelessDragPosition);
+                    this->move(pos);
                     event->accept();
                     return;
                 }
@@ -207,7 +209,7 @@ namespace BlackGui
             {
                 if (event->buttons() & Qt::LeftButton)
                 {
-                    m_framelessDragPosition = this->mapToParent(event->pos());
+                    m_framelessDragPosition = event->pos();
                     event->accept();
                     return;
                 }
diff --git a/src/blackgui/components/navigatordialog.ui b/src/blackgui/components/navigatordialog.ui
index ad9ee9c3c..921298bcb 100644
--- a/src/blackgui/components/navigatordialog.ui
+++ b/src/blackgui/components/navigatordialog.ui
@@ -21,16 +21,16 @@
   </property>
   <layout class="QGridLayout" name="gl_NavigatorDialog">
    <property name="leftMargin">
-    <number>3</number>
+    <number>5</number>
    </property>
    <property name="topMargin">
-    <number>3</number>
+    <number>5</number>
    </property>
    <property name="rightMargin">
-    <number>3</number>
+    <number>5</number>
    </property>
    <property name="bottomMargin">
-    <number>3</number>
+    <number>5</number>
    </property>
    <item row="0" column="0">
     <widget class="QFrame" name="fr_NavigatorDialogInner"/>