diff --git a/qt/torrent-filter.cc b/qt/torrent-filter.cc
index 4a4c6e0e3..f5d63d17b 100644
--- a/qt/torrent-filter.cc
+++ b/qt/torrent-filter.cc
@@ -44,14 +44,20 @@ TorrentFilter :: refreshPref( int key )
 {
     switch( key )
     {
+        case Prefs :: FILTER_MODE:
+            if( rowCount( ) > 0 )
+            {
+                invalidateFilter( );
+                break;
+            }
+            invalidateFilter( );
+            /* force a re-sort */
+            sort( 0, !myPrefs.getBool(Prefs::SORT_REVERSED) ? Qt::AscendingOrder : Qt::DescendingOrder );
         case Prefs :: SORT_MODE:
         case Prefs :: SORT_REVERSED:
             sort( 0, myPrefs.getBool(Prefs::SORT_REVERSED) ? Qt::AscendingOrder : Qt::DescendingOrder );
             invalidate( );
             break;
-        case Prefs :: FILTER_MODE:
-            invalidateFilter( );
-            break;
     }
 }