diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -69,8 +69,16 @@
 
     m_clipboardHelper = new ClipboardHelper(this);
 
+    ui->mainLayout->setContentsMargins(
+        style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
+        style()->pixelMetric(QStyle::PM_LayoutTopMargin),
+        style()->pixelMetric(QStyle::PM_LayoutRightMargin),
+        style()->pixelMetric(QStyle::PM_LayoutBottomMargin)
+    );
+
     m_errorMessage = new KMessageWidget();
     m_errorMessage->setMessageType(KMessageWidget::Error);
+    m_errorMessage->setPosition(KMessageWidget::Position::Header);
     m_errorMessage->hide();
     ui->messagesArea->addWidget(m_errorMessage);
 
@@ -90,6 +98,7 @@
 
     {
         m_notInitialized = new KMessageWidget(i18n("Password store not initialized"));
+        m_notInitialized->setPosition(KMessageWidget::Position::Header);
         m_notInitialized->setCloseButtonVisible(false);
         QAction* action = new QAction(i18n("Initialize with users"));
         connect(action, &QAction::triggered, this, [this](){this->userDialog();});
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -14,9 +14,27 @@
    <string>GnuPG Password Manager</string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <layout class="QGridLayout" name="gridLayout_2">
-    <item row="1" column="0">
-     <layout class="QHBoxLayout" name="horizontalLayout_3">
+   <layout class="QVBoxLayout" name="gridLayout_2">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <property name="spacing">
+     <number>0</number>
+    </property>
+    <item>
+     <layout class="QVBoxLayout" name="messagesArea"/>
+    </item>
+    <item>
+     <layout class="QHBoxLayout" name="mainLayout">
       <item>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
@@ -173,9 +191,6 @@
       </item>
      </layout>
     </item>
-    <item row="0" column="0">
-     <layout class="QVBoxLayout" name="messagesArea"/>
-    </item>
    </layout>
   </widget>
   <widget class="QStatusBar" name="statusBar"/>