diff --git a/src/gui/EditWidget.cpp b/src/gui/EditWidget.cpp
index 760af05f..69e64516 100644
--- a/src/gui/EditWidget.cpp
+++ b/src/gui/EditWidget.cpp
@@ -46,6 +46,11 @@ void EditWidget::add(const QString& labelText, QWidget* widget)
     m_ui->stackedWidget->addWidget(widget);
 }
 
+void EditWidget::setRowHidden(int row, bool hide)
+{
+    m_ui->categoryList->item(row)->setHidden(hide);
+}
+
 void EditWidget::setCurrentRow(int index)
 {
     m_ui->categoryList->setCurrentRow(index);
diff --git a/src/gui/EditWidget.h b/src/gui/EditWidget.h
index ff44cef2..60c1b28c 100644
--- a/src/gui/EditWidget.h
+++ b/src/gui/EditWidget.h
@@ -37,6 +37,7 @@ public:
     ~EditWidget();
 
     void add(const QString& labelText, QWidget* widget);
+    void setRowHidden(int row, bool hide);
     void setCurrentRow(int index);
     void setHeadline(const QString& text);
     QLabel* headlineLabel();
diff --git a/src/gui/entry/EditEntryWidget.cpp b/src/gui/entry/EditEntryWidget.cpp
index 856e7e6e..b65b2ce1 100644
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@@ -177,6 +177,9 @@ void EditEntryWidget::loadEntry(Entry* entry, bool create, bool history, const Q
     }
 
     setForms(entry);
+
+    setCurrentRow(0);
+    setRowHidden(4, m_history);
 }
 
 void EditEntryWidget::setForms(const Entry* entry, bool restore)
@@ -247,8 +250,6 @@ void EditEntryWidget::setForms(const Entry* entry, bool restore)
 
     updateHistoryButtons(m_historyUi->historyView->currentIndex(), QModelIndex());
 
-    setCurrentRow(0);
-
     m_mainUi->titleEdit->setFocus();
 }