diff --git a/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt b/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt
index 6e265a2a7cd8..ccc6f27bd0ef 100644
--- a/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt
+++ b/app/src/main/java/com/nextcloud/ui/fileactions/FileAction.kt
@@ -122,8 +122,6 @@ enum class FileAction(
                 R.id.action_lock_file,
                 R.id.action_unlock_file,
                 R.id.action_edit,
-                R.id.action_favorite,
-                R.id.action_unset_favorite,
                 R.id.action_see_details,
                 R.id.action_move_or_copy,
                 R.id.action_stream_media,
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 555286f2e6ad..406a75268d3f 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -484,6 +484,12 @@ private void optionsItemSelected(@IdRes final int itemId) {
         } else if (itemId == R.id.action_encrypted) {
             // TODO implement or remove
         } else if (itemId == R.id.action_unset_encrypted) {// TODO implement or remove
+        } else if (itemId == R.id.action_favorite) {
+            containerActivity.getFileOperationsHelper().toggleFavoriteFile(getFile(), true);
+            setFavoriteIconStatus(true);
+        } else if (itemId == R.id.action_unset_favorite) {
+            containerActivity.getFileOperationsHelper().toggleFavoriteFile(getFile(), false);
+            setFavoriteIconStatus(false);
         }
     }