diff --git a/src/components/Drawer/Drawer.css b/src/components/Drawer/Drawer.css
index ed8cc1d..f535b0f 100644
--- a/src/components/Drawer/Drawer.css
+++ b/src/components/Drawer/Drawer.css
@@ -1,6 +1,6 @@
 .drawer {
     display: block;
-    height: 100%;
+    height: calc(100% - 64px);
     background: white;
     position: fixed;
     top: 64px;
diff --git a/src/components/EnableWhen/EnableBehavior.tsx b/src/components/EnableWhen/EnableBehavior.tsx
index c37c22c..af8d7be 100644
--- a/src/components/EnableWhen/EnableBehavior.tsx
+++ b/src/components/EnableWhen/EnableBehavior.tsx
@@ -21,16 +21,13 @@ const EnableBehavior = ({ currentItem, dispatchUpdateItemEnableBehavior }: Props
                         ? QuestionnaireItemEnableBehaviorCodes.ALL
                         : QuestionnaireItemEnableBehaviorCodes.ANY
                 }
-                options={[
-                    {
-                        code: QuestionnaireItemEnableBehaviorCodes.ANY,
-                        display: t('At least one condition must be fulfilled'),
-                    },
-                    {
-                        code: QuestionnaireItemEnableBehaviorCodes.ALL,
-                        display: t('All conditions must be fulfilled'),
-                    },
-                ]}
+                options={[{
+                    code: QuestionnaireItemEnableBehaviorCodes.ALL,
+                    display: t('All conditions must be fulfilled')
+                }, {
+                    code: QuestionnaireItemEnableBehaviorCodes.ANY,
+                    display: t('At least one condition must be fulfilled')
+                }]}
                 name={`ew-behavior-${currentItem.linkId}`}
             />
         </div>
diff --git a/src/components/EnableWhen/EnableWhen.tsx b/src/components/EnableWhen/EnableWhen.tsx
index e2fe47b..96c7c1f 100644
--- a/src/components/EnableWhen/EnableWhen.tsx
+++ b/src/components/EnableWhen/EnableWhen.tsx
@@ -64,7 +64,13 @@ const EnableWhen = ({
 
     return (
         <div>
-            <p>{t('Set a condition for displaying this question:')}</p>
+            <p>{t('Define which conditions must be fulfilled for enabling this question.\nIf no conditions are defined, the question is always enabled.')}</p>
+            {enableWhen.length > 1 && (
+                <EnableBehavior
+                    currentItem={getItem(linkId)}
+                    dispatchUpdateItemEnableBehavior={dispatchUpdateItemEnableBehavior}
+                />
+            )}
             {enableWhen.map((x, index) => {
                 const conditionItem = getItem(x.question);
                 const hasValidationError = itemValidationErrors.some(
@@ -158,12 +164,6 @@ const EnableWhen = ({
                 icon="ion-plus-round"
                 title={t('Add a condition')}
             />
-            {enableWhen.length > 1 && (
-                <EnableBehavior
-                    currentItem={getItem(linkId)}
-                    dispatchUpdateItemEnableBehavior={dispatchUpdateItemEnableBehavior}
-                />
-            )}
             {enableWhen.length > 0 && (
                 <EnableWhenInfoBox
                     getItem={getItem}
diff --git a/src/components/Question/Question.css b/src/components/Question/Question.css
index d030c93..9b5877b 100644
--- a/src/components/Question/Question.css
+++ b/src/components/Question/Question.css
@@ -1,6 +1,5 @@
 .question {
     background: white;
-    box-shadow: 0px 4px 4px rgba(0, 0, 0, 0.25);
     border-radius: 8px;
     margin-bottom: 24px;
 }
diff --git a/src/store/treeStore/treeStore.tsx b/src/store/treeStore/treeStore.tsx
index 2f157f5..838bcfc 100644
--- a/src/store/treeStore/treeStore.tsx
+++ b/src/store/treeStore/treeStore.tsx
@@ -1,7 +1,7 @@
 import React, { createContext, Dispatch, useEffect, useReducer } from 'react';
 import produce from 'immer';
 
-import { Extension, QuestionnaireItem, ValueSet } from '../../types/fhir';
+import { Extension, QuestionnaireItem, QuestionnaireItemEnableBehaviorCodes, ValueSet } from '../../types/fhir';
 import {
     ADD_ITEM_CODE_ACTION,
     ADD_QUESTIONNAIRE_LANGUAGE_ACTION,
@@ -60,7 +60,7 @@ import {
 } from './treeActions';
 import { IQuestionnaireMetadata, IQuestionnaireMetadataType } from '../../types/IQuestionnaireMetadataType';
 import createUUID from '../../helpers/CreateUUID';
-import { IItemProperty, UseContextSystem } from '../../types/IQuestionnareItemType';
+import { IEnableWhen, IItemProperty, UseContextSystem } from '../../types/IQuestionnareItemType';
 import { INITIAL_LANGUAGE } from '../../helpers/LanguageHelper';
 import { isIgnorableItem } from '../../helpers/itemControl';
 import { createOptionReferenceExtensions } from '../../helpers/extensionHelper';
@@ -394,6 +394,21 @@ function updateItem(draft: TreeState, action: UpdateItemAction): void {
             ...createOptionReferenceExtensions,
         ];
     }
+
+    const isAnyOf = <T,>(val: T | undefined, ...options: (T | undefined)[]): boolean => {
+        return options.includes(val);
+    };
+
+    if (action.itemProperty === 'enableWhen') {
+        const numEntries = (action.itemValue as IEnableWhen[]).length;
+        if (numEntries <= 1) {
+            draft.qItems[action.linkId].enableBehavior = undefined;
+        } else if (numEntries > 1 &&
+            !isAnyOf(draft.qItems[action.linkId].enableBehavior, QuestionnaireItemEnableBehaviorCodes.ALL, QuestionnaireItemEnableBehaviorCodes.ANY)
+        ) {
+            draft.qItems[action.linkId].enableBehavior = QuestionnaireItemEnableBehaviorCodes.ALL;
+        }
+    }
 }
 
 function addItemCode(draft: TreeState, action: AddItemCodeAction): void {