diff --git a/ChangeLog b/ChangeLog
index 279496650..d439acb19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@
 6. Fix truncated files served from internal HTTP server.
 7. When adding songs to an existing play lists, dont allow play list files to
    be added.
+8. If Ctrl-F is activated again whilst search widget is visible, then select
+   all current text.
 
 1.2.1
 -----
diff --git a/widgets/searchwidget.cpp b/widgets/searchwidget.cpp
index bc9034cc5..dde7935ee 100644
--- a/widgets/searchwidget.cpp
+++ b/widgets/searchwidget.cpp
@@ -161,6 +161,7 @@ void SearchWidget::activate()
 {
     bool wasActive=widgetIsActive;
     widgetIsActive=true;
+    edit->selectAll();
     show();
     setFocus();
     if (wasActive!=widgetIsActive) {