diff --git a/src/dialog/vfindreplacedialog.cpp b/src/dialog/vfindreplacedialog.cpp
index 69b01eff..5cc3df7a 100644
--- a/src/dialog/vfindreplacedialog.cpp
+++ b/src/dialog/vfindreplacedialog.cpp
@@ -32,6 +32,9 @@ void VFindReplaceDialog::setupUI()
     m_findPrevBtn = new QPushButton(tr("Find &Previous"));
     m_findPrevBtn->setProperty("FlatBtn", true);
 
+    setTabOrder(m_findEdit, m_findNextBtn);
+    setTabOrder(m_findNextBtn, m_findPrevBtn);
+
     // Replace
     QLabel *replaceLabel = new QLabel(tr("&Replace with:"));
     m_replaceEdit = new QLineEdit();
@@ -47,6 +50,12 @@ void VFindReplaceDialog::setupUI()
     m_advancedBtn->setProperty("FlatBtn", true);
     m_advancedBtn->setCheckable(true);
 
+    setTabOrder(m_findPrevBtn, m_replaceEdit);
+    setTabOrder(m_replaceEdit, m_replaceBtn);
+    setTabOrder(m_replaceBtn, m_replaceFindBtn);
+    setTabOrder(m_replaceFindBtn, m_replaceAllBtn);
+    setTabOrder(m_replaceAllBtn, m_advancedBtn);
+
     // Options
     m_caseSensitiveCheck = new QCheckBox(tr("&Case sensitive"), this);
     connect(m_caseSensitiveCheck, &QCheckBox::stateChanged,
@@ -189,6 +198,12 @@ void VFindReplaceDialog::advancedBtnToggled(bool p_checked)
     m_wholeWordOnlyCheck->setVisible(p_checked);
     m_regularExpressionCheck->setVisible(p_checked);
     m_incrementalSearchCheck->setVisible(p_checked);
+
+    setTabOrder(m_advancedBtn, m_caseSensitiveCheck);
+    setTabOrder(m_caseSensitiveCheck, m_wholeWordOnlyCheck);
+    setTabOrder(m_wholeWordOnlyCheck, m_regularExpressionCheck);
+    setTabOrder(m_regularExpressionCheck, m_incrementalSearchCheck);
+    setTabOrder(m_incrementalSearchCheck, m_closeBtn);
 }
 
 void VFindReplaceDialog::optionBoxToggled(int p_state)