diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index cbe27ee4e..b651b5285 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -2393,9 +2393,10 @@ bool DatabaseWidget::performSave(QString& errorMessage, const QString& fileName)
     QPointer<QWidget> focusWidget(qApp->focusWidget());
 
     // Lock out interactions
-    m_entryView->setDisabled(true);
-    m_groupView->setDisabled(true);
-    m_tagView->setDisabled(true);
+    auto mainWindow = getMainWindow();
+    if (mainWindow) {
+        mainWindow->setDisabled(true);
+    }
     QApplication::processEvents();
 
     Database::SaveAction saveAction = Database::Atomic;
@@ -2435,9 +2436,9 @@ bool DatabaseWidget::performSave(QString& errorMessage, const QString& fileName)
     }
 
     // Return control
-    m_entryView->setDisabled(false);
-    m_groupView->setDisabled(false);
-    m_tagView->setDisabled(false);
+    if (mainWindow) {
+        mainWindow->setDisabled(false);
+    }
 
     if (focusWidget && focusWidget->isVisible()) {
         focusWidget->setFocus();
diff --git a/src/gui/styles/base/BaseStyle.cpp b/src/gui/styles/base/BaseStyle.cpp
index 458da1c27..9cb844d70 100644
--- a/src/gui/styles/base/BaseStyle.cpp
+++ b/src/gui/styles/base/BaseStyle.cpp
@@ -1029,7 +1029,7 @@ namespace Phantom
         // Expected time (release): 5usecs for regular-sized arrows
         Q_NEVER_INLINE void drawArrow(QPainter* p, QRect rect, Qt::ArrowType arrowDirection, const QBrush& brush)
         {
-            const qreal ArrowBaseRatio = 0.9;
+            const qreal ArrowBaseRatio = 1.0;
             qreal irx, iry, irw, irh;
             QRectF(rect).getRect(&irx, &iry, &irw, &irh);
             if (irw < 1.0 || irh < 1.0)
diff --git a/src/gui/styles/dark/darkstyle.qss b/src/gui/styles/dark/darkstyle.qss
index b25458e9f..2b0cfebc0 100644
--- a/src/gui/styles/dark/darkstyle.qss
+++ b/src/gui/styles/dark/darkstyle.qss
@@ -1,11 +1,11 @@
-DatabaseWidget:!active, GroupView:!active,
+DatabaseWidget:!active,
 DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active,
 EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active,
 EntryPreviewWidget TagsEdit:!active, QStatusBar:!active {
     background-color: #404042;
 }
 
-DatabaseWidget:disabled, GroupView:disabled,
+DatabaseWidget:disabled,
 DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled,
 EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled,
 EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled {
diff --git a/src/gui/styles/light/lightstyle.qss b/src/gui/styles/light/lightstyle.qss
index ceb8164ae..a2b6d7769 100644
--- a/src/gui/styles/light/lightstyle.qss
+++ b/src/gui/styles/light/lightstyle.qss
@@ -1,11 +1,11 @@
-DatabaseWidget:!active, GroupView:!active,
+DatabaseWidget:!active,
 DatabaseWidget #groupView:!active, DatabaseWidget #tagView:!active,
 EntryPreviewWidget QLineEdit:!active, EntryPreviewWidget QTextEdit:!active,
 EntryPreviewWidget TagsEdit:!active, QStatusBar:!active {
     background-color: #FCFCFC;
 }
 
-DatabaseWidget:disabled, GroupView:disabled,
+DatabaseWidget:disabled,
 DatabaseWidget #groupView:disabled, DatabaseWidget #tagView:disabled,
 EntryPreviewWidget QLineEdit:disabled, EntryPreviewWidget QTextEdit:disabled,
 EntryPreviewWidget TagsEdit:disabled, QStatusBar:disabled {