diff --git a/app/src/main/java/net/moasdawiki/app/MainActivity.java b/app/src/main/java/net/moasdawiki/app/MainActivity.java
index 191cb0e..d2f69e5 100644
--- a/app/src/main/java/net/moasdawiki/app/MainActivity.java
+++ b/app/src/main/java/net/moasdawiki/app/MainActivity.java
@@ -59,7 +59,6 @@ import net.moasdawiki.http.HttpRequest;
 import net.moasdawiki.server.RequestDispatcher;
 import net.moasdawiki.service.HttpResponse;
 import net.moasdawiki.service.repository.RepositoryService;
-import net.moasdawiki.util.EscapeUtils;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
@@ -396,7 +395,11 @@ public class MainActivity extends AppCompatActivity {
 
     @NonNull
     private String getWikiserverSearchUrl(@NonNull String query) {
-        return SERVER_BASE_URL + "search/?text=" + EscapeUtils.encodeUrlParameter(query);
+        return Uri.parse(SERVER_BASE_URL + "search/")
+                .buildUpon()
+                .appendQueryParameter("text", query)
+                .build()
+                .toString();
     }
 
     @NonNull