diff --git a/src/notelistdelegate.cpp b/src/notelistdelegate.cpp
index b96c151f..6a1983af 100644
--- a/src/notelistdelegate.cpp
+++ b/src/notelistdelegate.cpp
@@ -89,6 +89,45 @@ NoteListDelegate::NoteListDelegate(NoteListView *view, TagPool *tagPool, QObject
     });
 }
 
+int NoteListDelegate::minimumContentHeight() const
+{
+    const int titleHeight = qMax(QFontMetrics(m_titleFont).height(), QFontMetrics(m_titleSelectedFont).height());
+    const int dateHeight = QFontMetrics(m_dateFont).height();
+    const int contentHeight = titleHeight;
+
+    return note_list_constants::TOP_OFFSET_Y + titleHeight + dateHeight + contentHeight + note_list_constants::DATE_DESC_SPACE;
+}
+
+int NoteListDelegate::minimumRowHeight() const
+{
+    int result = minimumContentHeight() + note_list_constants::LAST_EL_SEP_SPACE;
+    if (m_isInAllNotes) {
+        const int folderLineHeight = qMax(QFontMetrics(m_titleFont).height(), 16) + note_list_constants::DESC_FOLDER_SPACE;
+        result += folderLineHeight;
+    }
+    return result;
+}
+
+int NoteListDelegate::sectionHeaderHeight(const QModelIndex &index, const NoteListModel &model)
+{
+    if (model.hasPinnedNote() && (model.isFirstPinnedNote(index) || model.isFirstUnpinnedNote(index))) {
+        return note_list_constants::SECTION_HEADER_HEIGHT;
+    }
+
+    return 0;
+}
+
+// Extra vertical gap inserted above the first unpinned note so it clears the
+// pinned section. Shared by sizeHint(), bufferSizeHint() and paintBackground()
+// so the row rect, paint buffer and background fill all stay the same height.
+int NoteListDelegate::firstUnpinnedGap(const QModelIndex &index, const NoteListModel &model) const
+{
+    if (model.hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && model.isFirstUnpinnedNote(index)) {
+        return note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
+    }
+    return 0;
+}
+
 void NoteListDelegate::setState(NoteListState NewState, QModelIndexList indexes)
 {
     if (animationState() != QTimeLine::NotRunning) {
@@ -178,9 +217,8 @@ QSize NoteListDelegate::sizeHint(const QStyleOptionViewItem &option, const QMode
         if (m_state == NoteListState::MoveIn) {
             result.setHeight(rowHeight);
         } else {
-            double rate = m_timeLine->currentFrame() / (m_maxFrame * 1.0);
-            double height = rowHeight * rate;
-            result.setHeight(int(height));
+            const double rate = m_timeLine->currentFrame() / (m_maxFrame * 1.0);
+            result.setHeight(int(rowHeight * rate));
         }
     } else {
         result.setHeight(rowHeight);
@@ -192,18 +230,18 @@ QSize NoteListDelegate::sizeHint(const QStyleOptionViewItem &option, const QMode
         auto isPinned = note.isPinnedNote();
         if (isPinned) {
             if (noteListModel->isFirstPinnedNote(index)) {
-                result.setHeight(25);
+                result.setHeight(note_list_constants::SECTION_HEADER_HEIGHT);
                 return result;
             }
             result.setHeight(0);
             return result;
         }
         if (noteListModel->hasPinnedNote() && noteListModel->isFirstUnpinnedNote(index)) {
-            result.setHeight(result.height() + 25);
+            result.setHeight(result.height() + note_list_constants::SECTION_HEADER_HEIGHT);
         }
     } else {
         if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(index) || noteListModel->isFirstUnpinnedNote(index))) {
-            result.setHeight(result.height() + 25);
+            result.setHeight(result.height() + note_list_constants::SECTION_HEADER_HEIGHT);
         }
     }
     int secondYOffset = 0;
@@ -218,17 +256,18 @@ QSize NoteListDelegate::sizeHint(const QStyleOptionViewItem &option, const QMode
     if (noteListModel->isFirstUnpinnedNote(index)) {
         fourthYOffset = note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
     }
-    int fifthYOffset = 0;
-    if (noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(index)) {
-        fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
-    }
+    int fifthYOffset = firstUnpinnedGap(index, *noteListModel);
 
     int yOffsets = secondYOffset + thirdYOffset + fourthYOffset + fifthYOffset;
+    const int minimumHeight = minimumRowHeight() + sectionHeaderHeight(index, *noteListModel) + yOffsets;
     if (m_isInAllNotes) {
         result.setHeight(result.height() - 2 + note_list_constants::LAST_EL_SEP_SPACE + yOffsets);
     } else {
         result.setHeight(result.height() - 10 + note_list_constants::LAST_EL_SEP_SPACE + yOffsets);
     }
+    if (!m_animatedIndexes.contains(index)) {
+        result.setHeight(qMax(result.height(), minimumHeight));
+    }
     return result;
 }
 
@@ -257,7 +296,7 @@ QSize NoteListDelegate::bufferSizeHint(const QStyleOptionViewItem &option, const
         auto isPinned = index.data(NoteListModel::NoteIsPinned).value<bool>();
         if (isPinned) {
             if (noteListModel->isFirstPinnedNote(index)) {
-                result.setHeight(25);
+                result.setHeight(note_list_constants::SECTION_HEADER_HEIGHT);
                 return result;
             }
             result.setHeight(0);
@@ -276,13 +315,16 @@ QSize NoteListDelegate::bufferSizeHint(const QStyleOptionViewItem &option, const
     if (noteListModel->isFirstUnpinnedNote(index)) {
         fourthYOffset = note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
     }
+    int fifthYOffset = firstUnpinnedGap(index, *noteListModel);
 
-    int yOffsets = secondYOffset + thirdYOffset + fourthYOffset;
+    int yOffsets = secondYOffset + thirdYOffset + fourthYOffset + fifthYOffset;
+    const int minimumHeight = minimumRowHeight() + sectionHeaderHeight(index, *noteListModel) + yOffsets;
     if (m_isInAllNotes) {
         result.setHeight(result.height() - 2 + note_list_constants::LAST_EL_SEP_SPACE + yOffsets);
     } else {
         result.setHeight(result.height() - 10 + note_list_constants::LAST_EL_SEP_SPACE + yOffsets);
     }
+    result.setHeight(qMax(result.height(), minimumHeight));
     return result;
 }
 
@@ -301,7 +343,12 @@ void NoteListDelegate::paintBackground(QPainter *painter, const QStyleOptionView
     QRect bufferRect = buffer.rect();
     auto isPinned = index.data(NoteListModel::NoteIsPinned).toBool();
     auto const *model = static_cast<NoteListModel *>(m_view->model());
-    if (model->hasPinnedNote() && model->isFirstPinnedNote(index) && static_cast<NoteListView *>(m_view)->isPinnedNotesCollapsed()) {
+    const bool isCollapsedPinnedHeader = m_view->isPinnedNotesCollapsed() && model->isFirstPinnedNote(index);
+    const int bodyTopOffset = sectionHeaderHeight(index, *model) + firstUnpinnedGap(index, *model);
+    if (bodyTopOffset > 0 && !isCollapsedPinnedHeader) {
+        bufferRect.setY(bufferRect.y() + bodyTopOffset);
+    }
+    if (model->hasPinnedNote() && isCollapsedPinnedHeader) {
         bufferPainter.fillRect(bufferRect, QBrush(m_defaultColor));
     } else if ((option.state & QStyle::State_Selected) == QStyle::State_Selected) {
         if (qApp->applicationState() == Qt::ApplicationActive) {
@@ -396,16 +443,18 @@ void NoteListDelegate::paintBackground(QPainter *painter, const QStyleOptionView
     if (m_animatedIndexes.contains(index)) {
         if (m_state == NoteListState::MoveIn) {
             if (model->hasPinnedNote() && (model->isFirstPinnedNote(index) || model->isFirstUnpinnedNote(index))) {
-                painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + bufferSize.height() - rowHeight + 25, option.rect.width(), rowHeight }, buffer,
-                                    QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
+                painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + bufferSize.height() - rowHeight + note_list_constants::SECTION_HEADER_HEIGHT,
+                                           option.rect.width(), rowHeight },
+                                    buffer, QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             } else {
                 painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + bufferSize.height() - rowHeight, option.rect.width(), rowHeight }, buffer,
                                     QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             }
         } else {
             if (model->hasPinnedNote() && (model->isFirstPinnedNote(index) || model->isFirstUnpinnedNote(index))) {
-                painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + 25, option.rect.width(), option.rect.height() }, buffer,
-                                    QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
+                painter->drawPixmap(
+                        QRect{ option.rect.x(), option.rect.y() + note_list_constants::SECTION_HEADER_HEIGHT, option.rect.width(), option.rect.height() },
+                        buffer, QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             } else {
                 painter->drawPixmap(option.rect, buffer, QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             }
@@ -463,10 +512,7 @@ void NoteListDelegate::paintLabels(QPainter *painter, const QStyleOptionViewItem
             fourthYOffset = note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
         }
 
-        int fifthYOffset = 0;
-        if (noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(index)) {
-            fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
-        }
+        int fifthYOffset = firstUnpinnedGap(index, *noteListModel);
 
         int yOffsets = secondYOffset + thirdYOffset + fourthYOffset + fifthYOffset;
         double titleRectPosX = rowPosX + note_list_constants::LEFT_OFFSET_X;
@@ -529,16 +575,17 @@ void NoteListDelegate::paintLabels(QPainter *painter, const QStyleOptionViewItem
 
         if (m_state == NoteListState::MoveIn) {
             if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(index) || noteListModel->isFirstUnpinnedNote(index))) {
-                painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + bufferSize.height() - rowHeight + 25, option.rect.width(), rowHeight }, buffer,
-                                    QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
+                painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + bufferSize.height() - rowHeight + note_list_constants::SECTION_HEADER_HEIGHT,
+                                           option.rect.width(), rowHeight },
+                                    buffer, QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             } else {
                 painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + bufferSize.height() - rowHeight, option.rect.width(), rowHeight }, buffer,
                                     QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             }
         } else {
             if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(index) || noteListModel->isFirstUnpinnedNote(index))) {
-                painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + 25, option.rect.width(), rowHeight }, buffer,
-                                    QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
+                painter->drawPixmap(QRect{ option.rect.x(), option.rect.y() + note_list_constants::SECTION_HEADER_HEIGHT, option.rect.width(), rowHeight },
+                                    buffer, QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             } else {
                 painter->drawPixmap(option.rect, buffer, QRect{ 0, bufferSize.height() - rowHeight, option.rect.width(), rowHeight });
             }
@@ -546,7 +593,7 @@ void NoteListDelegate::paintLabels(QPainter *painter, const QStyleOptionViewItem
         if (noteListModel->hasPinnedNote()) {
             if (noteListModel->isFirstPinnedNote(index)) {
                 QRect headerRect(option.rect.x() + (note_list_constants::LEFT_OFFSET_X / 2), option.rect.y(),
-                                 option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2), 25);
+                                 option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2), note_list_constants::SECTION_HEADER_HEIGHT);
 #ifdef __APPLE__
                 int iconPointSizeOffset = 0;
 #else
@@ -566,7 +613,7 @@ void NoteListDelegate::paintLabels(QPainter *painter, const QStyleOptionViewItem
                 painter->drawText(headerRect, Qt::AlignLeft | Qt::AlignVCenter, "Pinned");
             } else if (noteListModel->isFirstUnpinnedNote(index)) {
                 QRect headerRect(option.rect.x() + (note_list_constants::LEFT_OFFSET_X / 2), option.rect.y() + fifthYOffset,
-                                 option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2), 25);
+                                 option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2), note_list_constants::SECTION_HEADER_HEIGHT);
                 painter->setPen(m_contentColor);
                 painter->setFont(m_headerFont);
                 painter->drawText(headerRect, Qt::AlignLeft | Qt::AlignVCenter, "Notes");
@@ -594,13 +641,11 @@ void NoteListDelegate::paintLabels(QPainter *painter, const QStyleOptionViewItem
         double rowPosX = option.rect.x();
         double rowPosY = option.rect.y();
         auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
-        int fifthYOffset = 0;
-        if (noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(index)) {
-            fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
-        }
+        int fifthYOffset = firstUnpinnedGap(index, *noteListModel);
 
         if (noteListModel->isFirstPinnedNote(index)) {
-            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2), 25);
+            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2),
+                             note_list_constants::SECTION_HEADER_HEIGHT);
 #ifdef __APPLE__
             int iconPointSizeOffset = 0;
 #else
@@ -618,14 +663,15 @@ void NoteListDelegate::paintLabels(QPainter *painter, const QStyleOptionViewItem
             painter->setPen(m_contentColor);
             painter->setFont(m_headerFont);
             painter->drawText(headerRect, Qt::AlignLeft | Qt::AlignVCenter, "Pinned");
-            rowPosY += 25;
+            rowPosY += note_list_constants::SECTION_HEADER_HEIGHT;
         } else if (noteListModel->hasPinnedNote() && noteListModel->isFirstUnpinnedNote(index)) {
             rowPosY += fifthYOffset;
-            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2), 25);
+            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, option.rect.width() - (note_list_constants::LEFT_OFFSET_X / 2),
+                             note_list_constants::SECTION_HEADER_HEIGHT);
             painter->setPen(m_contentColor);
             painter->setFont(m_headerFont);
             painter->drawText(headerRect, Qt::AlignLeft | Qt::AlignVCenter, "Notes");
-            rowPosY += 25;
+            rowPosY += note_list_constants::SECTION_HEADER_HEIGHT;
         }
         if (m_view->isPinnedNotesCollapsed()) {
             auto isPinned = index.data(NoteListModel::NoteIsPinned).value<bool>();
diff --git a/src/notelistdelegate.h b/src/notelistdelegate.h
index c7767a39..5d803d13 100644
--- a/src/notelistdelegate.h
+++ b/src/notelistdelegate.h
@@ -36,6 +36,7 @@ class NoteListDelegate : public QStyledItemDelegate
     Theme::Value theme() const;
     void setIsInAllNotes(bool newIsInAllNotes);
     bool isInAllNotes() const;
+    static int sectionHeaderHeight(const QModelIndex &index, const NoteListModel &model);
     void clearSizeMap();
 
 public slots:
@@ -53,6 +54,9 @@ public slots:
     void animationFinished(NoteListState animationState);
 
 private:
+    int minimumContentHeight() const;
+    int minimumRowHeight() const;
+    int firstUnpinnedGap(const QModelIndex &index, const NoteListModel &model) const;
     void paintBackground(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
     void paintLabels(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
     void paintSeparator(QPainter *painter, QRect rect, const QModelIndex &index) const;
diff --git a/src/notelistdelegateeditor.cpp b/src/notelistdelegateeditor.cpp
index a34245f2..112d2941 100644
--- a/src/notelistdelegateeditor.cpp
+++ b/src/notelistdelegateeditor.cpp
@@ -71,49 +71,7 @@ NoteListDelegateEditor::NoteListDelegateEditor(const NoteListDelegate *delegate,
     m_tagListView->setItemDelegate(m_tagListDelegate);
     m_tagListModel->setTagPool(tagPool);
     m_tagListModel->setModelData(index.data(NoteListModel::NoteTagsList).value<QSet<int>>());
-    if (m_delegate->isInAllNotes()) {
-        int y = 90;
-        auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
-        if (noteListModel != nullptr) {
-            auto idx = noteListModel->getNoteIndex(m_id);
-            if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(idx) || noteListModel->isFirstUnpinnedNote(idx))) {
-                y += 25;
-            }
-        }
-        int fourthYOffset = 0;
-        if ((noteListModel != nullptr) && noteListModel->isFirstUnpinnedNote(index)) {
-            fourthYOffset = note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
-        }
-        int fifthYOffset = 0;
-        if ((noteListModel != nullptr) && noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(index)) {
-            fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
-        }
-        int yOffsets = fourthYOffset + fifthYOffset;
-
-        y += yOffsets;
-        m_tagListView->setGeometry(10, y - 5, rect().width() - 15, m_tagListView->height());
-    } else {
-        int y = 70;
-        auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
-        if (noteListModel != nullptr) {
-            auto idx = noteListModel->getNoteIndex(m_id);
-            if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(idx) || noteListModel->isFirstUnpinnedNote(idx))) {
-                y += 25;
-            }
-        }
-        int fourthYOffset = 0;
-        if ((noteListModel != nullptr) && noteListModel->isFirstUnpinnedNote(index)) {
-            fourthYOffset = note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
-        }
-        int fifthYOffset = 0;
-        if ((noteListModel != nullptr) && noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(index)) {
-            fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
-        }
-        int yOffsets = fourthYOffset + fifthYOffset;
-
-        y += yOffsets;
-        m_tagListView->setGeometry(10, y - 5, rect().width() - 15, m_tagListView->height());
-    }
+    m_tagListView->setGeometry(10, tagListTop(index) - 5, rect().width() - 15, m_tagListView->height());
     connect(m_tagListView->verticalScrollBar(), &QScrollBar::valueChanged, this, [this] {
         auto idx = static_cast<NoteListModel *>(m_view->model())->getNoteIndex(m_id);
         static_cast<NoteListModel *>(m_view->model())->setData(idx, getScrollBarPos(), NoteListModel::NoteTagListScrollbarPos);
@@ -127,6 +85,46 @@ NoteListDelegateEditor::NoteListDelegateEditor(const NoteListDelegate *delegate,
     setAcceptDrops(true);
 }
 
+int NoteListDelegateEditor::minimumContentHeight() const
+{
+    const int titleHeight = qMax(QFontMetrics(m_titleFont).height(), QFontMetrics(m_titleSelectedFont).height());
+    const int dateHeight = QFontMetrics(m_dateFont).height();
+    const int contentHeight = titleHeight;
+
+    return note_list_constants::TOP_OFFSET_Y + titleHeight + dateHeight + contentHeight + note_list_constants::DATE_DESC_SPACE;
+}
+
+int NoteListDelegateEditor::minimumRowHeight() const
+{
+    int result = minimumContentHeight() + note_list_constants::LAST_EL_SEP_SPACE;
+    if (m_delegate->isInAllNotes()) {
+        const int folderLineHeight = qMax(QFontMetrics(m_titleFont).height(), 16) + note_list_constants::DESC_FOLDER_SPACE;
+        result += folderLineHeight;
+    }
+    return result;
+}
+
+int NoteListDelegateEditor::tagListTop(const QModelIndex &index) const
+{
+    int top = minimumContentHeight();
+    if (m_delegate->isInAllNotes()) {
+        top += qMax(QFontMetrics(m_titleFont).height(), 16) + note_list_constants::DESC_FOLDER_SPACE;
+    }
+
+    auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
+    if (noteListModel != nullptr) {
+        top += NoteListDelegate::sectionHeaderHeight(index, *noteListModel);
+        if (noteListModel->isFirstUnpinnedNote(index)) {
+            top += note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
+        }
+        if (noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(index)) {
+            top += note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
+        }
+    }
+
+    return top;
+}
+
 NoteListDelegateEditor::~NoteListDelegateEditor()
 {
     m_view->unsetEditorWidget(m_id, nullptr);
@@ -146,7 +144,7 @@ void NoteListDelegateEditor::paintBackground(QPainter *painter, const QStyleOpti
         if (!m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(index)) {
             fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
         }
-        bufferRect.setY(bufferRect.y() + 25 + fifthYOffset);
+        bufferRect.setY(bufferRect.y() + note_list_constants::SECTION_HEADER_HEIGHT + fifthYOffset);
     }
     auto isPinned = index.data(NoteListModel::NoteIsPinned).toBool();
     if (m_view->selectionModel()->isSelected(index)) {
@@ -260,7 +258,8 @@ void NoteListDelegateEditor::paintLabels(QPainter *painter, const QStyleOptionVi
     }
     if (noteListModel->hasPinnedNote()) {
         if (noteListModel->isFirstPinnedNote(index)) {
-            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, rowWidth - (note_list_constants::LEFT_OFFSET_X / 2), 25);
+            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, rowWidth - (note_list_constants::LEFT_OFFSET_X / 2),
+                             note_list_constants::SECTION_HEADER_HEIGHT);
 #ifdef __APPLE__
             int iconPointSizeOffset = 0;
 #else
@@ -278,14 +277,15 @@ void NoteListDelegateEditor::paintLabels(QPainter *painter, const QStyleOptionVi
             painter->setPen(m_contentColor);
             painter->setFont(m_headerFont);
             painter->drawText(headerRect, Qt::AlignLeft | Qt::AlignVCenter, "Pinned");
-            rowPosY += 25;
+            rowPosY += note_list_constants::SECTION_HEADER_HEIGHT;
         } else if (noteListModel->isFirstUnpinnedNote(index)) {
             rowPosY += fifthYOffset;
-            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, rowWidth - (note_list_constants::LEFT_OFFSET_X / 2), 25);
+            QRect headerRect(rowPosX + (note_list_constants::LEFT_OFFSET_X / 2), rowPosY, rowWidth - (note_list_constants::LEFT_OFFSET_X / 2),
+                             note_list_constants::SECTION_HEADER_HEIGHT);
             painter->setPen(m_contentColor);
             painter->setFont(m_headerFont);
             painter->drawText(headerRect, Qt::AlignLeft | Qt::AlignVCenter, "Notes");
-            rowPosY += 25;
+            rowPosY += note_list_constants::SECTION_HEADER_HEIGHT;
         }
     }
     if (m_view->isPinnedNotesCollapsed()) {
@@ -402,46 +402,9 @@ void NoteListDelegateEditor::paintEvent(QPaintEvent *event)
 void NoteListDelegateEditor::resizeEvent(QResizeEvent *event)
 {
     QWidget::resizeEvent(event);
-    if (m_delegate->isInAllNotes()) {
-        int y = 90;
-        auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
-        auto const idx = noteListModel->getNoteIndex(m_id);
-        if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(idx) || noteListModel->isFirstUnpinnedNote(idx))) {
-            y += 25;
-        }
-        int fourthYOffset = 0;
-        if (noteListModel->isFirstUnpinnedNote(idx)) {
-            fourthYOffset = note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
-        }
-        int fifthYOffset = 0;
-        if (noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(idx)) {
-            fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
-        }
-        int yOffsets = fourthYOffset + fifthYOffset;
-        y += yOffsets;
-
-        m_tagListView->setGeometry(note_list_constants::LEFT_OFFSET_X - 5, y + 5, rect().width() - 15, m_tagListView->height());
-    } else {
-        int y = 70;
-        auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
-        auto const idx = noteListModel->getNoteIndex(m_id);
-        if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(idx) || noteListModel->isFirstUnpinnedNote(idx))) {
-            y += 25;
-        }
-        int fourthYOffset = 0;
-        if (noteListModel->isFirstUnpinnedNote(idx)) {
-            fourthYOffset = note_list_constants::UNPINNED_HEADER_TO_NOTE_SPACE;
-        }
-        int fifthYOffset = 0;
-        if (noteListModel->hasPinnedNote() && !m_view->isPinnedNotesCollapsed() && noteListModel->isFirstUnpinnedNote(idx)) {
-            fifthYOffset = note_list_constants::LAST_PINNED_TO_UNPINNED_HEADER;
-        }
-        int yOffsets = fourthYOffset + fifthYOffset;
-
-        y += yOffsets;
-
-        m_tagListView->setGeometry(note_list_constants::LEFT_OFFSET_X - 5, y, rect().width() - 15, m_tagListView->height());
-    }
+    auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
+    auto const idx = noteListModel->getNoteIndex(m_id);
+    m_tagListView->setGeometry(note_list_constants::LEFT_OFFSET_X - 5, tagListTop(idx), rect().width() - 15, m_tagListView->height());
     recalculateSize();
 }
 
@@ -498,13 +461,13 @@ void NoteListDelegateEditor::recalculateSize()
     auto const *noteListModel = static_cast<NoteListModel *>(m_view->model());
     auto idx = noteListModel->getNoteIndex(m_id);
     if (noteListModel->hasPinnedNote() && (noteListModel->isFirstPinnedNote(idx) || noteListModel->isFirstUnpinnedNote(idx))) {
-        result.setHeight(result.height() + 25);
+        result.setHeight(result.height() + note_list_constants::SECTION_HEADER_HEIGHT);
     }
     if (noteListModel->hasPinnedNote() && m_view->isPinnedNotesCollapsed()) {
         auto isPinned = idx.data(NoteListModel::NoteIsPinned).value<bool>();
         if (isPinned) {
             if (noteListModel->isFirstPinnedNote(idx)) {
-                result.setHeight(25);
+                result.setHeight(note_list_constants::SECTION_HEADER_HEIGHT);
             } else {
                 result.setHeight(0);
             }
@@ -536,6 +499,8 @@ void NoteListDelegateEditor::recalculateSize()
     } else {
         result.setHeight(result.height() - 10 + note_list_constants::LAST_EL_SEP_SPACE + yOffsets);
     }
+    const int minimumHeight = minimumRowHeight() + NoteListDelegate::sectionHeaderHeight(idx, *noteListModel) + m_tagListView->height() + 2 + yOffsets;
+    result.setHeight(qMax(result.height(), minimumHeight));
     emit updateSizeHint(m_id, result, idx);
 }
 
diff --git a/src/notelistdelegateeditor.h b/src/notelistdelegateeditor.h
index e0b6ac9d..b458df63 100644
--- a/src/notelistdelegateeditor.h
+++ b/src/notelistdelegateeditor.h
@@ -18,6 +18,7 @@ auto constexpr TITLE_DATE_SPACE = 2; // space between title and date
 auto constexpr DATE_DESC_SPACE = 5; // space between date and description
 auto constexpr DESC_FOLDER_SPACE = 14; // space between description and folder name
 auto constexpr LAST_EL_SEP_SPACE = 12; // space between the last element and the separator
+auto constexpr SECTION_HEADER_HEIGHT = 25;
 auto constexpr NEXT_NOTE_OFFSET = 0; // space between the separator and the next note underneath it
 auto constexpr PINNED_HEADER_TO_NOTE_SPACE = 0; // space between Pinned label to the pinned list
 auto constexpr UNPINNED_HEADER_TO_NOTE_SPACE = 0; // space between Notes label and the normal notes list
@@ -47,6 +48,9 @@ public slots:
     void nearDestroyed(int id, const QModelIndex &index);
 
 private:
+    int minimumContentHeight() const;
+    int minimumRowHeight() const;
+    int tagListTop(const QModelIndex &index) const;
     void paintBackground(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
     void paintLabels(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
     void paintSeparator(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const;