diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e0e53f4..089d71f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@ Version counting is based on semantic versioning (Major.Feature.Patch)
 * New search engine.
 * New `manga` field added to comics and folders to tag content as manga, any content added to a manga folder will become manga automatically.
 * Support for HTML in comic synopsis, this fixes the synopsis when it comes from Comic Vine with HTML tags.
+* Improve keyboard navigation in Comic Vine dialog. 
 
 ## 9.7.1
 ### YACReader
diff --git a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
index f922fa83..237519b9 100644
--- a/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
+++ b/YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
@@ -57,6 +57,11 @@ void ComicVineDialog::doLayout()
     searchButton = new QPushButton(tr("search"));
     closeButton = new QPushButton(tr("close"));
 
+    backButton->setShortcut(QKeySequence(Qt::Key_Backspace));
+
+    closeButton->setDefault(false);
+    closeButton->setAutoDefault(false);
+
     skipButton->setStyleSheet(dialogButtonsStyleSheet);
     backButton->setStyleSheet(dialogButtonsStyleSheet);
     nextButton->setStyleSheet(dialogButtonsStyleSheet);
@@ -303,10 +308,9 @@ void ComicVineDialog::showSeriesQuestion()
     searchButton->setHidden(true);
     closeButton->setVisible(true);
 
-    if (mode == SingleComicInList)
-        skipButton->setVisible(true);
-    else
-        skipButton->setHidden(true);
+    nextButton->setDefault(true);
+
+    toggleSkipButton();
 }
 
 void ComicVineDialog::showSearchSingleComic()
@@ -319,10 +323,9 @@ void ComicVineDialog::showSearchSingleComic()
     searchButton->setVisible(true);
     closeButton->setVisible(true);
 
-    if (mode == SingleComicInList)
-        skipButton->setVisible(true);
-    else
-        skipButton->setHidden(true);
+    searchButton->setDefault(true);
+
+    toggleSkipButton();
 }
 
 void ComicVineDialog::showSearchVolume()
@@ -333,6 +336,9 @@ void ComicVineDialog::showSearchVolume()
     nextButton->setHidden(true);
     searchButton->setVisible(true);
     closeButton->setVisible(true);
+
+    searchButton->setDefault(true);
+
     toggleSkipButton();
 }
 
@@ -352,6 +358,9 @@ void ComicVineDialog::showSelectVolume()
     nextButton->setVisible(true);
     searchButton->setHidden(true);
     closeButton->setVisible(true);
+
+    nextButton->setDefault(true);
+
     toggleSkipButton();
 }
 
@@ -366,6 +375,9 @@ void ComicVineDialog::showSelectComic(const QString &json)
     nextButton->setVisible(true);
     searchButton->setHidden(true);
     closeButton->setVisible(true);
+
+    nextButton->setDefault(true);
+
     toggleSkipButton();
 }
 
@@ -381,6 +393,9 @@ void ComicVineDialog::showSortVolumeComics(const QString &json)
     nextButton->setVisible(true);
     searchButton->setHidden(true);
     closeButton->setVisible(true);
+
+    nextButton->setDefault(true);
+
     toggleSkipButton();
 }
 
diff --git a/custom_widgets/whats_new_dialog.cpp b/custom_widgets/whats_new_dialog.cpp
index 2fad753b..c80cceb8 100644
--- a/custom_widgets/whats_new_dialog.cpp
+++ b/custom_widgets/whats_new_dialog.cpp
@@ -57,6 +57,7 @@ YACReader::WhatsNewDialog::WhatsNewDialog(QWidget *parent)
                   "   &#8226; New fuzzy search engine. Type to search into any field of the database, or target specific content <i>\"read:false manga:true filename:3x3\"</i>, read more about how it works in the <a href=\"https://www.yacreader.com\" style=\"color:#E8B800;\">web site</a>. <br/>"
                   "   &#8226; New `manga` field added to comics and folders to tag content as manga, any content added to a manga folder will become manga automatically.<br/>"
                   "   &#8226; Support for HTML in comic synopsis, this fixes the synopsis when it comes from Comic Vine with HTML tags.<br/>"
+                  "   &#8226; Improve keyboard navigation in Comic Vine dialog. Enter will trigger next or search and Backspace will go back to the previous section.<br/>"
                   "<br/>"
                   "<span style=\"font-weight:600\">Server</span><br/>"
                   "   &#8226; New `manga` field is sent to YACReader for iOS, so comics tagged as manga will be recognized as such when reading remotely or importing comics.<br/>"