Index: mythmusic/mythmusic/search.cpp
===================================================================
--- mythmusic/mythmusic/search.cpp	(revision 12582)
+++ mythmusic/mythmusic/search.cpp	(working copy)
@@ -81,6 +81,8 @@
     bool isNumber = false;
     searchText.toULongLong(&isNumber);
 
+    searchText.replace("'", "''");
+
     if (!isNumber)
     {
         QString testString = searchText;
@@ -174,6 +176,7 @@
                 for (uint i = 0; i < list.count(); i++) 
                 {
                     QString stxt = list[i];
+		    stxt.replace("''", "'");
                     int index = -1;
                     while( (index = text.findRev(stxt, index, false)) != -1 ) 
                     {