diff --git a/src/gui/Src/Gui/MainWindow.cpp b/src/gui/Src/Gui/MainWindow.cpp
index ac46d74d..99161f6a 100644
--- a/src/gui/Src/Gui/MainWindow.cpp
+++ b/src/gui/Src/Gui/MainWindow.cpp
@@ -2170,6 +2170,7 @@ void MainWindow::chooseLanguage()
 
 void MainWindow::addFavouriteItem(int type, const QString & name, const QString & description)
 {
+    bool check = true;
     if(type == 0) // Tools
     {
         char buffer[MAX_SETTING_SIZE];
@@ -2192,7 +2193,14 @@ void MainWindow::addFavouriteItem(int type, const QString & name, const QString
         unsigned int i;
         for(i = 1; BridgeSettingGet("Favourite", (QString("Command") + QString::number(i)).toUtf8().constData(), buffer); i++)
         {
+            if(QString(buffer) == name)
+            {
+                check = false;
+                break;
+            }
         }
+        if (check)
+        {
         BridgeSettingSet("Favourite", (QString("Command") + QString::number(i)).toUtf8().constData(), name.toUtf8().constData());
         BridgeSettingSet("Favourite", (QString("CommandShortcut") + QString::number(i)).toUtf8().constData(), description.toUtf8().constData());
         if(BridgeSettingGet("Favourite", (QString("Command") + QString::number(i + 1)).toUtf8().constData(), buffer))
@@ -2200,6 +2208,7 @@ void MainWindow::addFavouriteItem(int type, const QString & name, const QString
             buffer[0] = 0;
             BridgeSettingSet("Favourite", (QString("Command") + QString::number(i + 1)).toUtf8().constData(), buffer);
         }
+        }
         updateFavouriteTools();
     }
 }
@@ -2226,7 +2235,7 @@ void MainWindow::setFavouriteItemShortcut(int type, const QString & name, const
         {
             if(QString(buffer) == name)
             {
-                BridgeSettingSet("Favourite", (QString("CommandShortcut") + QString::number(i)).toUtf8().constData(), description.toUtf8().constData());
+                BridgeSettingSet("Favourite", (QString("CommandShortcut") + QString::number(i)).toUtf8().constData(), shortcut.toUtf8().constData());
                 updateFavouriteTools();
                 break;
             }