diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index d2ff0d33..aedad473 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -430,9 +430,14 @@ void DatabaseWidget::switchToEntryEdit(Entry* entry)
 
 void DatabaseWidget::switchToEntryEdit(Entry* entry, bool create)
 {
-    Q_ASSERT(entry->group());
+    Group* group = m_groupView->currentGroup();
+    if (!group) {
+        Q_ASSERT(m_entryView->inEntryListMode());
+        group = m_lastGroup;
+    }
+    Q_ASSERT(group);
 
-    m_editEntryWidget->loadEntry(entry, create, false, entry->group()->name(), m_db);
+    m_editEntryWidget->loadEntry(entry, create, false, group->name(), m_db);
     setCurrentWidget(m_editEntryWidget);
 }