diff --git a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
index 23786d974..87704bf35 100644
--- a/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/category/CategoryDetailsActivity.java
@@ -1,5 +1,7 @@
 package fr.free.nrw.commons.category;
 
+import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_PREFIX;
+
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
@@ -26,6 +28,7 @@ import fr.free.nrw.commons.media.MediaDetailPagerFragment;
 import fr.free.nrw.commons.theme.BaseActivity;
 import java.util.ArrayList;
 import java.util.List;
+import org.wikipedia.page.PageTitle;
 
 /**
  * This activity displays details of a particular category
@@ -179,7 +182,8 @@ public class CategoryDetailsActivity extends BaseActivity
         // Handle item selection
         switch (item.getItemId()) {
             case R.id.menu_browser_current_category:
-                Utils.handleWebUrl(this, Uri.parse(Utils.getPageTitle(categoryName).getCanonicalUri()));
+                PageTitle title = Utils.getPageTitle(CATEGORY_PREFIX + categoryName);
+                Utils.handleWebUrl(this, Uri.parse(title.getCanonicalUri()));
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
index 5f41abc3a..4c4c5cf67 100644
--- a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
@@ -3,7 +3,6 @@ package fr.free.nrw.commons.media;
 import static android.view.View.GONE;
 import static android.view.View.VISIBLE;
 import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_NEEDING_CATEGORIES;
-import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_PREFIX;
 import static fr.free.nrw.commons.category.CategoryClientKt.CATEGORY_UNCATEGORISED;
 
 import android.annotation.SuppressLint;
@@ -295,6 +294,9 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
             new OnGlobalLayoutListener() {
                 @Override
                 public void onGlobalLayout() {
+                    if (getContext() == null) {
+                        return;
+                    }
                     scrollView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {
                         imageLandscape.setVisibility(VISIBLE);
@@ -836,9 +838,8 @@ public class MediaDetailFragment extends CommonsDaggerSupportFragment implements
         if(!getString(R.string.detail_panel_cats_none).equals(catName)) {
             textView.setOnClickListener(view -> {
                 // Open Category Details page
-                String selectedCategoryTitle = CATEGORY_PREFIX + catName;
                 Intent intent = new Intent(getContext(), CategoryDetailsActivity.class);
-                intent.putExtra("categoryName", selectedCategoryTitle);
+                intent.putExtra("categoryName", catName);
                 getContext().startActivity(intent);
             });
         }