diff --git a/include/courtroom.h b/include/courtroom.h
index af4b69e..ee682ba 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -664,6 +664,7 @@ private slots:
 
   void on_ooc_return_pressed();
 
+  void on_music_search_return_pressed();
   void on_music_search_edited(QString p_text);
   void on_music_list_double_clicked(QTreeWidgetItem *p_item, int column);
   void on_music_list_context_menu_requested(const QPoint &pos);
diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 5d38f8b..0991a52 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -322,6 +322,8 @@ Courtroom::Courtroom(AOApplication *p_ao_app) : QMainWindow()
   connect(ui_effects_dropdown, SIGNAL(customContextMenuRequested(QPoint)), this,
           SLOT(on_effects_context_menu_requested(QPoint)));
 
+  connect(ui_music_search, SIGNAL(returnPressed()), this,
+          SLOT(on_music_search_return_pressed()));
   connect(ui_mute_list, SIGNAL(clicked(QModelIndex)), this,
           SLOT(on_mute_list_clicked(QModelIndex)));
 
@@ -3552,6 +3554,13 @@ void Courtroom::on_music_search_edited(QString p_text)
   }
 }
 
+void Courtroom::on_music_search_return_pressed()
+{
+  if (ui_music_search->text() == "") {
+    ui_music_list->collapseAll();
+  }
+}
+
 void Courtroom::on_pos_dropdown_changed(int p_index)
 {
   if (p_index < 0 || p_index > 7)