diff --git a/client/source/scripts/components/generic/Dropdown.js b/client/source/scripts/components/generic/Dropdown.js
index 5f3d9833..9a1f81d8 100644
--- a/client/source/scripts/components/generic/Dropdown.js
+++ b/client/source/scripts/components/generic/Dropdown.js
@@ -86,8 +86,14 @@ export default class Dropdown extends React.Component {
         'is-selectable': property.selectable !== false,
         'is-selected': property.selected
       })
+      let clickHandler = null;
+
+      if (property.selectable !== false) {
+        clickHandler = this.handleItemSelect.bind(this, property);
+      }
+
       return (
-        <li className={classes} key={index} onClick={this.handleItemSelect.bind(this, property)}>
+        <li className={classes} key={index} onClick={clickHandler}>
           {property.displayName}
         </li>
       );