diff --git a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
index ef2a4463b..57ba3b43d 100644
--- a/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
+++ b/F-Droid/src/org/fdroid/fdroid/data/AppProvider.java
@@ -546,12 +546,11 @@ public class AppProvider extends FDroidProvider {
         if (TextUtils.isEmpty(query)) {
             // Return all the things for an empty search.
             return getContentUri();
-        } else {
-            return getContentUri().buildUpon()
-                    .appendPath(PATH_SEARCH)
-                    .appendPath(query)
-                    .build();
         }
+        return getContentUri().buildUpon()
+                .appendPath(PATH_SEARCH)
+                .appendPath(query)
+                .build();
     }
 
     public static Uri getSearchInstalledUri(String query) {
diff --git a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
index d8a9fa5d8..35918f065 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -199,11 +199,10 @@ public abstract class AppListFragment extends ListFragment implements
             onSearchStopped();
             setEmptyText(getEmptyMessage());
             return false;
-        } else {
-            onSearch();
-            setEmptyText(getNoSearchResultsMessage());
-            return true;
         }
+        onSearch();
+        setEmptyText(getNoSearchResultsMessage());
+        return true;
     }
 
     public void updateSearchQuery(@Nullable String query) {