diff --git a/app/qml/components/MMListMultiselectDrawer.qml b/app/qml/components/MMListMultiselectDrawer.qml
index 5caa085e2..bd83a44de 100644
--- a/app/qml/components/MMListMultiselectDrawer.qml
+++ b/app/qml/components/MMListMultiselectDrawer.qml
@@ -39,13 +39,13 @@ MMDrawer {
 
   drawerContent: Item {
     width: parent.width
-    height: showFullScreen ? root.drawerContentAvailableHeight : contentLayout.height
+    height: showFullScreen && listViewComponent.count > 0 ? root.drawerContentAvailableHeight : contentLayout.height
 
     Column {
       id: contentLayout
 
       width: parent.width
-      height: showFullScreen ? parent.height : implicitHeight
+      height: showFullScreen && listViewComponent.count > 0 ? parent.height : implicitHeight
 
       spacing: 0
 
diff --git a/app/qml/form/editors/MMFormValueRelationEditor.qml b/app/qml/form/editors/MMFormValueRelationEditor.qml
index ae4016be2..1e5db1d7e 100644
--- a/app/qml/form/editors/MMFormValueRelationEditor.qml
+++ b/app/qml/form/editors/MMFormValueRelationEditor.qml
@@ -84,7 +84,7 @@ MMFormComboboxBaseEditor {
 
       multiSelect: internal.allowMultivalue
       withSearch: vrModel.count > 5
-      showFullScreen: multiSelect || withSearch
+      showFullScreen: withSearch
 
       valueRole: "FeatureId"
       textRole: "FeatureTitle"