diff --git a/package.json b/package.json
index 4e1af6a..36a3e5b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bahmni-form-controls",
-  "version": "0.93.15",
+  "version": "0.93.16",
   "description": "Repository for form controls",
   "license": "GPL-2.0",
   "main": "./dist/bundle.js",
diff --git a/src/components/AutoComplete.jsx b/src/components/AutoComplete.jsx
index 5018703..5a418ff 100644
--- a/src/components/AutoComplete.jsx
+++ b/src/components/AutoComplete.jsx
@@ -209,6 +209,7 @@ export class AutoComplete extends Component {
             cache={cache}
             loadOptions={this.getOptions}
             onFocus={this.handleFocus}
+            optionClassName="needsclick"
             ref={this.storeChildRef}
           />
         </div>
@@ -221,6 +222,7 @@ export class AutoComplete extends Component {
           filterOptions={null}
           noResultsText={this.state.noResultsText}
           onInputChange={this.debouncedOnInputChange}
+          optionClassName="needsclick"
           options={this.state.options}
           ref={this.storeChildRef}
         />