diff --git a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaDateFieldWrapper.java b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaDateFieldWrapper.java
index 7b15abbd59..ffe5f4cfe9 100644
--- a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaDateFieldWrapper.java
+++ b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaDateFieldWrapper.java
@@ -53,6 +53,7 @@ public class CubaDateFieldWrapper extends com.vaadin.ui.CustomField {
         setValidationVisible(false);
         setShowBufferedSourceException(false);
         setShowErrorForDisabledState(false);
+        setFocusDelegate(dateField.getDateField());
 
         setPrimaryStyleName("c-datefield-composition");
     }
diff --git a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaPickerField.java b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaPickerField.java
index 306af55ccc..e4e80e24c1 100644
--- a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaPickerField.java
+++ b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaPickerField.java
@@ -105,6 +105,8 @@ public class CubaPickerField extends com.vaadin.ui.CustomField implements Action
             ThemeConstants theme = App.getInstance().getThemeConstants();
             setWidth(theme.get("cuba.web.CubaPickerField.width"));
         }
+
+        setFocusDelegate(field);
     }
 
     protected void initTextField() {
diff --git a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaResizableTextAreaWrapper.java b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaResizableTextAreaWrapper.java
index 36fa6df2dd..3fee49e7f5 100644
--- a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaResizableTextAreaWrapper.java
+++ b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaResizableTextAreaWrapper.java
@@ -48,6 +48,7 @@ public class CubaResizableTextAreaWrapper extends CustomField {
         setValidationVisible(false);
         setShowBufferedSourceException(false);
         setShowErrorForDisabledState(false);
+        setFocusDelegate(textArea);
 
         CubaResizableTextAreaWrapperServerRpc rpc = new CubaResizableTextAreaWrapperServerRpc() {
             String oldWidth;