diff --git a/src/ui/designer/QGCToolWidget.cc b/src/ui/designer/QGCToolWidget.cc
index bbd140d5a7aa35a25c681c0a5744e32cd16588f9..52072e8df12f4d8b23b0b6c269ccb17454a52f65 100644
--- a/src/ui/designer/QGCToolWidget.cc
+++ b/src/ui/designer/QGCToolWidget.cc
@@ -578,6 +578,11 @@ void QGCToolWidget::addLabel()
 {
     QGCTextLabel* label= new QGCTextLabel(this);
     connect(label, SIGNAL(destroyed()), this, SLOT(storeSettings()));
+    if (ui->hintLabel)
+    {
+        ui->hintLabel->deleteLater();
+        ui->hintLabel = NULL;
+    }
     toolLayout->addWidget(label);
     label->startEditMode();
 }
diff --git a/src/ui/designer/QGCToolWidget.h b/src/ui/designer/QGCToolWidget.h
index 818140e80f53444bdeda2f2d4d7df7b304a7e716..5d1f56d0c94781353070237fe589c99e28087f08 100644
--- a/src/ui/designer/QGCToolWidget.h
+++ b/src/ui/designer/QGCToolWidget.h
@@ -95,7 +95,7 @@ protected:
 
     void hideEvent(QHideEvent* event);
 public slots:
-    void setTitle(QString title);
+    void setTitle(const QString &title);
     void addParam(int uas,int component,QString paramname,QVariant value);
 protected slots:
     void addParam();
@@ -103,9 +103,6 @@ protected slots:
     void addLabel();
     void setTitle();
 
-    void setWindowTitle(const QString& title);
-
-
 private:
     Ui::QGCToolWidget *ui;
 };