diff --git a/app/client/src/components/editorComponents/CodeEditor/index.tsx b/app/client/src/components/editorComponents/CodeEditor/index.tsx
index 8cdbbc56dc..c3fb0a30f2 100644
--- a/app/client/src/components/editorComponents/CodeEditor/index.tsx
+++ b/app/client/src/components/editorComponents/CodeEditor/index.tsx
@@ -271,6 +271,7 @@ class CodeEditor extends Component<Props, State> {
       theme,
       disabled,
       className,
+      placeholder,
       showLightningMenu,
       dataTreePath,
       dynamicData,
@@ -349,12 +350,11 @@ class CodeEditor extends Component<Props, State> {
                 className="leftImageStyles"
               />
             )}
-
             <textarea
               ref={this.textArea}
               {..._.omit(this.props.input, ["onChange", "value"])}
               defaultValue={input.value}
-              placeholder={this.props.placeholder}
+              placeholder={placeholder}
             />
             {this.props.link && (
               <React.Fragment>
diff --git a/app/client/src/components/editorComponents/FormRow.tsx b/app/client/src/components/editorComponents/FormRow.tsx
index d70384821f..195d19cd20 100644
--- a/app/client/src/components/editorComponents/FormRow.tsx
+++ b/app/client/src/components/editorComponents/FormRow.tsx
@@ -6,4 +6,5 @@ export default styled.div`
   flex-direction: row;
   justify-content: space-between;
   align-items: flex-start;
+  min-height: 50px;
 `;
diff --git a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
index 04fba4d05f..d04f13a09a 100644
--- a/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
+++ b/app/client/src/components/editorComponents/form/fields/EmbeddedDatasourcePathField.tsx
@@ -237,7 +237,7 @@ const mapStateToProps = (
   };
 };
 
-const mapDispatchToProps = (dispatch: Function): ReduxDispatchProps => ({
+const mapDispatchToProps = (dispatch: any): ReduxDispatchProps => ({
   updateDatasource: datasource =>
     dispatch(change(API_EDITOR_FORM_NAME, "datasource", datasource)),
 });