diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
index abf924c93785..979062ede137 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java
@@ -14,8 +14,10 @@
 import android.accounts.OperationCanceledException;
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.ComponentCallbacks;
 import android.content.ContentValues;
 import android.content.res.ColorStateList;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ -198,6 +200,16 @@ public OCFileListAdapter(
         // initialise thumbnails cache on background thread
         ThumbnailsCacheManager.initDiskCacheAsync();
         isRTL = DisplayUtils.isRTL();
+
+        activity.registerComponentCallbacks(new ComponentCallbacks() {
+            @Override
+            public void onConfigurationChanged(@NonNull Configuration newConfig) {
+                notifyDataSetChanged(); // force update of orientation-dependent layout (e.g. share button visibility)
+            }
+            @Override
+            public void onLowMemory() {
+            }
+        });
     }
 
     public boolean isMultiSelect() {
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
index 1a11fe7a3251..da160ddc1249 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt
@@ -8,6 +8,7 @@
 package com.owncloud.android.ui.adapter
 
 import android.content.Context
+import android.content.res.Configuration
 import android.graphics.Color
 import android.os.AsyncTask
 import android.view.View
@@ -261,6 +262,7 @@ class OCFileListDelegate(
         // shares
         val shouldHideShare = (
             hideItemOptions ||
+                context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT ||
                 !file.isFolder &&
                 file.isEncrypted ||
                 file.isEncrypted &&