diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index 6571668c8..ec51312c1 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -73,15 +73,15 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     QLayout* layout = new QHBoxLayout();
     mainLayout->addWidget(m_messageWidget);
     mainLayout->addLayout(layout);
-    m_splitter = new QSplitter(m_mainWidget);
-    m_splitter->setChildrenCollapsible(false);
+    m_mainSplitter = new QSplitter(m_mainWidget);
+    m_mainSplitter->setChildrenCollapsible(false);
     m_detailSplitter = new QSplitter(m_mainWidget);
     m_detailSplitter->setOrientation(Qt::Vertical);
     m_detailSplitter->setChildrenCollapsible(true);
 
-    QWidget* rightHandSideWidget = new QWidget(m_splitter);
+    QWidget* rightHandSideWidget = new QWidget(m_mainSplitter);
 
-    m_groupView = new GroupView(db, m_splitter);
+    m_groupView = new GroupView(db, m_mainSplitter);
     m_groupView->setObjectName("groupView");
     m_groupView->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(m_groupView, SIGNAL(customContextMenuRequested(QPoint)),
@@ -122,13 +122,13 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
 
     setTabOrder(m_entryView, m_groupView);
 
-    m_splitter->addWidget(m_groupView);
-    m_splitter->addWidget(rightHandSideWidget);
+    m_mainSplitter->addWidget(m_groupView);
+    m_mainSplitter->addWidget(rightHandSideWidget);
 
-    m_splitter->setStretchFactor(0, 30);
-    m_splitter->setStretchFactor(1, 70);
+    m_mainSplitter->setStretchFactor(0, 30);
+    m_mainSplitter->setStretchFactor(1, 70);
 
-    layout->addWidget(m_splitter);
+    layout->addWidget(m_mainSplitter);
     m_mainWidget->setLayout(mainLayout);
 
     m_editEntryWidget = new EditEntryWidget();
@@ -168,7 +168,8 @@ DatabaseWidget::DatabaseWidget(Database* db, QWidget* parent)
     addWidget(m_keepass1OpenWidget);
     addWidget(m_unlockDatabaseWidget);
 
-    connect(m_splitter, SIGNAL(splitterMoved(int,int)), SIGNAL(splitterSizesChanged()));
+    connect(m_mainSplitter, SIGNAL(splitterMoved(int,int)), SIGNAL(mainSplitterSizesChanged()));
+    connect(m_detailSplitter, SIGNAL(splitterMoved(int,int)), SIGNAL(detailSplitterSizesChanged()));
     connect(m_entryView->header(), SIGNAL(sectionResized(int,int,int)), SIGNAL(entryColumnSizesChanged()));
     connect(m_groupView, SIGNAL(groupChanged(Group*)), this, SLOT(onGroupChanged(Group*)));
     connect(m_groupView, SIGNAL(groupChanged(Group*)), SIGNAL(groupChanged()));
@@ -251,14 +252,24 @@ bool DatabaseWidget::isEditWidgetModified() const
     }
 }
 
-QList<int> DatabaseWidget::splitterSizes() const
+QList<int> DatabaseWidget::mainSplitterSizes() const
 {
-    return m_splitter->sizes();
+    return m_mainSplitter->sizes();
 }
 
-void DatabaseWidget::setSplitterSizes(const QList<int>& sizes)
+void DatabaseWidget::setMainSplitterSizes(const QList<int>& sizes)
 {
-    m_splitter->setSizes(sizes);
+    m_mainSplitter->setSizes(sizes);
+}
+
+QList<int> DatabaseWidget::detailSplitterSizes() const
+{
+    return m_detailSplitter->sizes();
+}
+
+void DatabaseWidget::setDetailSplitterSizes(const QList<int> &sizes)
+{
+    m_detailSplitter->setSizes(sizes);
 }
 
 QList<int> DatabaseWidget::entryHeaderViewSizes() const
diff --git a/src/gui/DatabaseWidget.h b/src/gui/DatabaseWidget.h
index 404adb528..215077594 100644
--- a/src/gui/DatabaseWidget.h
+++ b/src/gui/DatabaseWidget.h
@@ -88,8 +88,10 @@ public:
     bool isGroupSelected() const;
     bool isInEditMode() const;
     bool isEditWidgetModified() const;
-    QList<int> splitterSizes() const;
-    void setSplitterSizes(const QList<int>& sizes);
+    QList<int> mainSplitterSizes() const;
+    void setMainSplitterSizes(const QList<int>& sizes);
+    QList<int> detailSplitterSizes() const;
+    void setDetailSplitterSizes(const QList<int>& sizes);
     QList<int> entryHeaderViewSizes() const;
     void setEntryViewHeaderSizes(const QList<int>& sizes);
     void clearAllWidgets();
@@ -123,7 +125,8 @@ signals:
     void listModeActivated();
     void searchModeAboutToActivate();
     void searchModeActivated();
-    void splitterSizesChanged();
+    void mainSplitterSizesChanged();
+    void detailSplitterSizesChanged();
     void entryColumnSizesChanged();
     void updateSearch(QString text);
 
@@ -214,7 +217,7 @@ private:
     KeePass1OpenWidget* m_keepass1OpenWidget;
     UnlockDatabaseWidget* m_unlockDatabaseWidget;
     UnlockDatabaseDialog* m_unlockDatabaseDialog;
-    QSplitter* m_splitter;
+    QSplitter* m_mainSplitter;
     QSplitter* m_detailSplitter;
     GroupView* m_groupView;
     EntryView* m_entryView;
diff --git a/src/gui/DatabaseWidgetStateSync.cpp b/src/gui/DatabaseWidgetStateSync.cpp
index 1510d8440..57a3dcf86 100644
--- a/src/gui/DatabaseWidgetStateSync.cpp
+++ b/src/gui/DatabaseWidgetStateSync.cpp
@@ -25,14 +25,16 @@ DatabaseWidgetStateSync::DatabaseWidgetStateSync(QObject* parent)
     , m_activeDbWidget(nullptr)
     , m_blockUpdates(false)
 {
-    m_splitterSizes = variantToIntList(config()->get("GUI/SplitterState"));
+    m_mainSplitterSizes = variantToIntList(config()->get("GUI/SplitterState"));
+    m_detailSplitterSizes = variantToIntList(config()->get("GUI/DetailSplitterState"));
     m_columnSizesList = variantToIntList(config()->get("GUI/EntryListColumnSizes"));
     m_columnSizesSearch = variantToIntList(config()->get("GUI/EntrySearchColumnSizes"));
 }
 
 DatabaseWidgetStateSync::~DatabaseWidgetStateSync()
 {
-    config()->set("GUI/SplitterState", intListToVariant(m_splitterSizes));
+    config()->set("GUI/SplitterState", intListToVariant(m_mainSplitterSizes));
+    config()->set("GUI/DetailSplitterState", intListToVariant(m_detailSplitterSizes));
     config()->set("GUI/EntryListColumnSizes", intListToVariant(m_columnSizesList));
     config()->set("GUI/EntrySearchColumnSizes", intListToVariant(m_columnSizesSearch));
 }
@@ -48,17 +50,25 @@ void DatabaseWidgetStateSync::setActive(DatabaseWidget* dbWidget)
     if (m_activeDbWidget) {
         m_blockUpdates = true;
 
-        if (!m_splitterSizes.isEmpty())
-            m_activeDbWidget->setSplitterSizes(m_splitterSizes);
+        if (!m_mainSplitterSizes.isEmpty()) {
+            m_activeDbWidget->setMainSplitterSizes(m_mainSplitterSizes);
+        }
 
-        if (m_activeDbWidget->isInSearchMode())
+        if (!m_detailSplitterSizes.isEmpty()) {
+            m_activeDbWidget->setDetailSplitterSizes(m_detailSplitterSizes);
+        }
+
+        if (m_activeDbWidget->isInSearchMode()) {
             restoreSearchView();
-        else
+        } else {
             restoreListView();
+        }
 
         m_blockUpdates = false;
 
-        connect(m_activeDbWidget, SIGNAL(splitterSizesChanged()),
+        connect(m_activeDbWidget, SIGNAL(mainSplitterSizesChanged()),
+                SLOT(updateSplitterSizes()));
+        connect(m_activeDbWidget, SIGNAL(detailSplitterSizesChanged()),
                 SLOT(updateSplitterSizes()));
         connect(m_activeDbWidget, SIGNAL(entryColumnSizesChanged()),
                 SLOT(updateColumnSizes()));
@@ -102,7 +112,8 @@ void DatabaseWidgetStateSync::updateSplitterSizes()
         return;
     }
 
-    m_splitterSizes = m_activeDbWidget->splitterSizes();
+    m_mainSplitterSizes = m_activeDbWidget->mainSplitterSizes();
+    m_detailSplitterSizes = m_activeDbWidget->detailSplitterSizes();
 }
 
 void DatabaseWidgetStateSync::updateColumnSizes()
diff --git a/src/gui/DatabaseWidgetStateSync.h b/src/gui/DatabaseWidgetStateSync.h
index 96ecd104a..79a8ded38 100644
--- a/src/gui/DatabaseWidgetStateSync.h
+++ b/src/gui/DatabaseWidgetStateSync.h
@@ -46,7 +46,8 @@ private:
     DatabaseWidget* m_activeDbWidget;
 
     bool m_blockUpdates;
-    QList<int> m_splitterSizes;
+    QList<int> m_mainSplitterSizes;
+    QList<int> m_detailSplitterSizes;
     QList<int> m_columnSizesList;
     QList<int> m_columnSizesSearch;
 };
diff --git a/src/gui/DetailsWidget.ui b/src/gui/DetailsWidget.ui
index fb31409f8..8fbafe349 100644
--- a/src/gui/DetailsWidget.ui
+++ b/src/gui/DetailsWidget.ui
@@ -6,22 +6,10 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>630</width>
+    <width>600</width>
     <height>200</height>
    </rect>
   </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>200</height>
-   </size>
-  </property>
   <layout class="QVBoxLayout" name="verticalLayout_3">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0,0,0,0">
@@ -36,12 +24,6 @@
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="maximumSize">
-        <size>
-         <width>20</width>
-         <height>16777215</height>
-        </size>
-       </property>
        <property name="text">
         <string/>
        </property>
@@ -166,85 +148,19 @@
       <layout class="QVBoxLayout" name="verticalLayout_5">
        <item>
         <widget class="QStackedWidget" name="stackedWidget">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
          <property name="currentIndex">
           <number>0</number>
          </property>
          <widget class="QWidget" name="entryPage">
-          <layout class="QGridLayout" name="gridLayout" columnstretch="1,3">
+          <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,1">
+           <item row="0" column="2">
+            <widget class="QLabel" name="usernameLabel">
+             <property name="textInteractionFlags">
+              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+             </property>
+            </widget>
+           </item>
            <item row="1" column="1">
-            <widget class="QLabel" name="passwordLabel"/>
-           </item>
-           <item row="2" column="1">
-            <widget class="QLabel" name="urlLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="cursor">
-              <cursorShape>PointingHandCursor</cursorShape>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="0">
-            <widget class="QLabel" name="expirationLabel_2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="font">
-              <font>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string>Expiration</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="urlLabel_2">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="font">
-              <font>
-               <pointsize>9</pointsize>
-               <weight>75</weight>
-               <bold>true</bold>
-              </font>
-             </property>
-             <property name="text">
-              <string>URL</string>
-             </property>
-             <property name="alignment">
-              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="1">
-            <widget class="QLabel" name="expirationLabel"/>
-           </item>
-           <item row="1" column="0">
             <widget class="QLabel" name="passwordLabel_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -267,6 +183,102 @@
             </widget>
            </item>
            <item row="0" column="0">
+            <spacer name="horizontalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>20</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="3" column="2">
+            <widget class="QLabel" name="expirationLabel"/>
+           </item>
+           <item row="4" column="2">
+            <spacer name="verticalSpacer_2">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="2" column="1">
+            <widget class="QLabel" name="urlLabel_2">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <pointsize>9</pointsize>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>URL</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="2">
+            <widget class="QLabel" name="urlLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="cursor">
+              <cursorShape>PointingHandCursor</cursorShape>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="1">
+            <widget class="QLabel" name="expirationLabel_2">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="font">
+              <font>
+               <weight>75</weight>
+               <bold>true</bold>
+              </font>
+             </property>
+             <property name="text">
+              <string>Expiration</string>
+             </property>
+             <property name="alignment">
+              <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+             </property>
+            </widget>
+           </item>
+           <item row="1" column="2">
+            <widget class="QLabel" name="passwordLabel"/>
+           </item>
+           <item row="0" column="1">
             <widget class="QLabel" name="usernameLabel_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -291,41 +303,11 @@
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
-            <widget class="QLabel" name="usernameLabel">
-             <property name="textInteractionFlags">
-              <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-             </property>
-            </widget>
-           </item>
-           <item row="4" column="1">
-            <spacer name="verticalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
           </layout>
          </widget>
          <widget class="QWidget" name="groupPage">
-          <layout class="QGridLayout" name="gridLayout_4" columnstretch="1,3">
-           <item row="2" column="1">
-            <widget class="QLabel" name="groupExpirationLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="0">
+          <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,1">
+           <item row="0" column="1">
             <widget class="QLabel" name="autotypeLabel_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -347,7 +329,30 @@
              </property>
             </widget>
            </item>
-           <item row="1" column="1">
+           <item row="2" column="2">
+            <widget class="QLabel" name="groupExpirationLabel">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="2">
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>0</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+           <item row="1" column="2">
             <widget class="QLabel" name="searchingLabel">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -357,7 +362,7 @@
              </property>
             </widget>
            </item>
-           <item row="1" column="0">
+           <item row="1" column="1">
             <widget class="QLabel" name="searchingLabel_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -379,7 +384,7 @@
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
+           <item row="0" column="2">
             <widget class="QLabel" name="autotypeLabel">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -389,7 +394,7 @@
              </property>
             </widget>
            </item>
-           <item row="2" column="0">
+           <item row="2" column="1">
             <widget class="QLabel" name="groupExpirationLabel_2">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -411,15 +416,18 @@
              </property>
             </widget>
            </item>
-           <item row="3" column="1">
-            <spacer name="verticalSpacer">
+           <item row="0" column="0">
+            <spacer name="horizontalSpacer_3">
              <property name="orientation">
-              <enum>Qt::Vertical</enum>
+              <enum>Qt::Horizontal</enum>
+             </property>
+             <property name="sizeType">
+              <enum>QSizePolicy::Fixed</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
-               <height>40</height>
+               <height>20</height>
               </size>
              </property>
             </spacer>
@@ -434,27 +442,9 @@
       <attribute name="title">
        <string>Attributes</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout">
-       <item row="0" column="1">
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
         <widget class="QTextEdit" name="attributesEdit">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>1</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>80</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>80</height>
-          </size>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::ClickFocus</enum>
          </property>
@@ -469,27 +459,9 @@
       <attribute name="title">
        <string>Notes</string>
       </attribute>
-      <layout class="QFormLayout" name="formLayout_2">
-       <item row="0" column="1">
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
         <widget class="QTextEdit" name="notesEdit">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
-           <horstretch>0</horstretch>
-           <verstretch>1</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>0</width>
-           <height>80</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>16777215</width>
-           <height>80</height>
-          </size>
-         </property>
          <property name="focusPolicy">
           <enum>Qt::ClickFocus</enum>
          </property>
@@ -504,8 +476,8 @@
       <attribute name="title">
        <string>Autotype</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_2">
-       <item row="0" column="0">
+      <layout class="QVBoxLayout" name="verticalLayout_4">
+       <item>
         <widget class="QTreeWidget" name="autotypeTree">
          <property name="frameShadow">
           <enum>QFrame::Sunken</enum>