diff --git a/NEWS.md b/NEWS.md
index 16ea4e9f..fe243d6d 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -76,6 +76,7 @@ Red Panda C++ Version 2.27
   - enhancement: Syntax highlighting for c++ attributes.
   - enhancement: Show "std::function" in the completion list.
   - enhancement: Improvement in italic font support.
+  - fix: History not correctly loaded with up/down arrow key in the debug console.
   
   
 Red Panda C++ Version 2.26
diff --git a/RedPandaIDE/widgets/aboutdialog.cpp b/RedPandaIDE/widgets/aboutdialog.cpp
index c4a6d392..794c1320 100644
--- a/RedPandaIDE/widgets/aboutdialog.cpp
+++ b/RedPandaIDE/widgets/aboutdialog.cpp
@@ -22,8 +22,8 @@
 #include <QDebug>
 
 AboutDialog::AboutDialog(QWidget *parent) :
-    QDialog(parent),
-    ui(new Ui::AboutDialog)
+    QDialog{parent},
+    ui{new Ui::AboutDialog}
 {
     setWindowFlag(Qt::WindowContextHelpButtonHint,false);
     ui->setupUi(this);
diff --git a/RedPandaIDE/widgets/qconsole.cpp b/RedPandaIDE/widgets/qconsole.cpp
index 867afc83..e2570e6d 100644
--- a/RedPandaIDE/widgets/qconsole.cpp
+++ b/RedPandaIDE/widgets/qconsole.cpp
@@ -31,11 +31,11 @@
 #include "../utils.h"
 
 QConsole::QConsole(QWidget *parent):
-    QAbstractScrollArea(parent),
-    mContents(this),
-    mContentImage()
+    QAbstractScrollArea{parent},
+    mContents{this},
+    mContentImage{}
 {
-    mHistorySize = 500;
+    mMaxHistory = 500;
     mHistoryIndex = -1;
     mCommand = "";
     mCurrentEditableLine = "";
@@ -73,14 +73,14 @@ QConsole::QConsole(QWidget *parent):
 
 }
 
-int QConsole::historySize() const
+int QConsole::maxHistory() const
 {
-    return mHistorySize;
+    return mMaxHistory;
 }
 
-void QConsole::setHistorySize(int historySize)
+void QConsole::setMaxHistory(int historySize)
 {
-    mHistorySize = historySize;
+    mMaxHistory = historySize;
 }
 
 int QConsole::tabSize() const
@@ -570,32 +570,28 @@ void QConsole::keyPressEvent(QKeyEvent *event)
         if (mReadonly)
             return;
         emit commandInput(mCommand);
-        if (mHistorySize>0 && !mCommand.trimmed().isEmpty()) {
-            if (mCommandHistory.size()==mHistorySize) {
-                mCommandHistory.pop_front();
-                mHistoryIndex--;
+        if (mMaxHistory>0 && !mCommand.trimmed().isEmpty()) {
+            if (mCommandHistory.isEmpty()
+                || mCommandHistory.last()!=mCommand) {
+                if (mCommandHistory.length()==mMaxHistory) {
+                    mCommandHistory.pop_front();
+                }
+                mCommandHistory.append(mCommand);
             }
-            if (mCommandHistory.size()==0 || mHistoryIndex<0 || mHistoryIndex == mCommandHistory.size()-1) {
-                mHistoryIndex=mCommandHistory.size();
-            }
-            mCommandHistory.append(mCommand);
+            mHistoryIndex = mCommandHistory.length();
         }
         mCommand="";
         addLine("");
         return;
     case Qt::Key_Up:
         event->accept();
-        if (mHistorySize>0 && mHistoryIndex>0) {
-            mHistoryIndex--;
-            loadCommandFromHistory();
-        }
+        mHistoryIndex--;
+        loadCommandFromHistory();
         return;
     case Qt::Key_Down:
         event->accept();
-        if (mHistorySize>0 && mHistoryIndex<mCommandHistory.size()-1) {
-            mHistoryIndex++;
-            loadCommandFromHistory();
-        }
+        mHistoryIndex++;
+        loadCommandFromHistory();
         return;
     case Qt::Key_Left:
         event->accept();
@@ -791,9 +787,14 @@ void QConsole::textInputed(const QString &text)
 
 void QConsole::loadCommandFromHistory()
 {
-    if (mHistorySize<=0)
+    if (mMaxHistory<=0)
         return;
-    mCommand = mCommandHistory[mHistoryIndex];
+    if (mHistoryIndex<0)
+        mHistoryIndex=0;
+    if (mHistoryIndex<mCommandHistory.length())
+        mCommand = mCommandHistory[mHistoryIndex];
+    else
+        mCommand = "";
     QString lastLine = mContents.getLastLine();
     int len=mCurrentEditableLine.length();
     lastLine.remove(lastLine.length()-len,INT_MAX);
diff --git a/RedPandaIDE/widgets/qconsole.h b/RedPandaIDE/widgets/qconsole.h
index d91bc646..1ffd0fc8 100644
--- a/RedPandaIDE/widgets/qconsole.h
+++ b/RedPandaIDE/widgets/qconsole.h
@@ -112,8 +112,8 @@ class QConsole : public QAbstractScrollArea
     Q_OBJECT
 public:
     explicit QConsole(QWidget* parent = nullptr);
-    int historySize() const;
-    void setHistorySize(int historySize);
+    int maxHistory() const;
+    void setMaxHistory(int historySize);
 
     int tabSize() const;
 
@@ -142,7 +142,7 @@ signals:
 private:
     ConsoleLines mContents;
     QStringList mCommandHistory;
-    int mHistorySize;
+    int mMaxHistory;
     int mHistoryIndex;
     QString mCommand;
     QString mCurrentEditableLine;