diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
index 2a9e914435232d8fc711b98045bec210221129be..eac0f9b7a347d5aa9f041c9fedb37d8c2a2af3b3 100644
--- a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
+++ b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.cpp
@@ -833,7 +833,7 @@ ArmarXWidgetControllerPtr ArmarXMainWindow::createArmarXWidget(QString widgetNam
     }
     auto widgetUsage = mainSettings.value("WidgetUsageHistory").toList();
     widgetUsage.push_back(widgetName);
-    if (widgetUsage.size() > 40)
+    if (widgetUsage.size() > 100)
     {
         widgetUsage.pop_front();
     }
@@ -1161,6 +1161,8 @@ void ArmarXMainWindow::updateAvailableWidgetList()
 
     connect(completer, SIGNAL(activated(QString)), completerAction, SLOT(triggered(QString)));
     connect(searchField, SIGNAL(returnPressed()), completerAction, SLOT(triggered()));
+    connect(searchField, SIGNAL(returnPressed()), searchField, SLOT(clear()));
+    connect(completerAction, SIGNAL(accepted()), searchField, SLOT(clear()));
     connect(completerAction, SIGNAL(clicked(QString, QString)), this, SLOT(createArmarXWidget(QString, QString)), Qt::UniqueConnection);
     searchField->setCompleter(completer);
 
@@ -1336,6 +1338,7 @@ void AddArmarXWidgetAction::addArmarXWidget()
 
 void AddArmarXWidgetAction::dialogAccepted()
 {
+    emit accepted();
     emit clicked(this->data().toString(), dialog->editWidgetName->text());
 }
 
diff --git a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
index 8f1663377d4bf3a475ec174924b9fc1e74dce2fc..032c7b7d56ac9b346185e02bf74b0b14c20c6938 100644
--- a/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
+++ b/source/ArmarXGui/applications/ArmarXGui/ArmarXMainWindow.h
@@ -255,6 +255,7 @@ namespace armarx
         void dialogAccepted();
     signals:
         void clicked(QString widgetName, QString customInstanceName);
+        void accepted();
     private:
         ArmarXMainWindow* mainGui;
         WidgetNameDialog* dialog;