diff --git a/src/core/Alloc.cpp b/src/core/Alloc.cpp
index 625386a3f..743ffcdc9 100644
--- a/src/core/Alloc.cpp
+++ b/src/core/Alloc.cpp
@@ -83,7 +83,7 @@ void operator delete[](void* ptr) noexcept
  * Custom insecure delete operator that does not zero out memory before
  * freeing a buffer. Can be used for better performance.
  */
-void operator delete(void* ptr, bool)noexcept
+void operator delete(void* ptr, bool) noexcept
 {
     std::free(ptr);
 }
diff --git a/src/gui/DatabaseOpenDialog.cpp b/src/gui/DatabaseOpenDialog.cpp
index 620d3652b..5e6e41b7a 100644
--- a/src/gui/DatabaseOpenDialog.cpp
+++ b/src/gui/DatabaseOpenDialog.cpp
@@ -31,7 +31,10 @@ DatabaseOpenDialog::DatabaseOpenDialog(QWidget* parent)
     setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint | Qt::ForeignWindow);
 #endif
     connect(m_view, SIGNAL(dialogFinished(bool)), this, SLOT(complete(bool)));
-    setLayout(m_view->layout());
+    auto* layout = new QVBoxLayout();
+    layout->setMargin(0);
+    setLayout(layout);
+    layout->addWidget(m_view);
     setMinimumWidth(700);
 }
 
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
index d4257a772..4d9715a9d 100644
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -811,9 +811,8 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
 
 void MainWindow::adjustToTabVisibilityChange(bool tabsVisible)
 {
-    if (m_showToolbarSeparator) {
-        m_ui->toolbarSeparator->setVisible(!tabsVisible && m_ui->stackedWidget->currentIndex() == DatabaseTabScreen);
-    }
+    m_ui->toolbarSeparator->setVisible(m_showToolbarSeparator && !tabsVisible
+                                       && m_ui->stackedWidget->currentIndex() == DatabaseTabScreen);
 }
 
 void MainWindow::updateWindowTitle()