diff --git a/src/gui/Src/Gui/MainWindow.cpp b/src/gui/Src/Gui/MainWindow.cpp
index 649d959f..09f1bfdb 100644
--- a/src/gui/Src/Gui/MainWindow.cpp
+++ b/src/gui/Src/Gui/MainWindow.cpp
@@ -2170,7 +2170,6 @@ 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];
@@ -2193,24 +2192,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))
         {
-            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))
-            {
-                buffer[0] = 0;
-                BridgeSettingSet("Favourite", (QString("Command") + QString::number(i + 1)).toUtf8().constData(), buffer);
-            }
+            buffer[0] = 0;
+            BridgeSettingSet("Favourite", (QString("Command") + QString::number(i + 1)).toUtf8().constData(), buffer);
         }
-        
         updateFavouriteTools();
     }
 }
@@ -2230,19 +2219,6 @@ void MainWindow::setFavouriteItemShortcut(int type, const QString & name, const
             }
         }
     }
-    else if(type == 2) // Commands
-    {
-        char buffer[MAX_SETTING_SIZE];
-        for(unsigned int i = 1; BridgeSettingGet("Favourite", QString("Command%1").arg(i).toUtf8().constData(), buffer); i++)
-        {
-            if(QString(buffer) == name)
-            {
-                BridgeSettingSet("Favourite", (QString("CommandShortcut") + QString::number(i)).toUtf8().constData(), shortcut.toUtf8().constData());
-                updateFavouriteTools();
-                break;
-            }
-        }  
-    }
 }
 
 void MainWindow::animateIntoSlot()