diff --git a/app/components/SelectableList.jsx b/app/components/SelectableList.jsx
index dc62dd9..1a3913b 100644
--- a/app/components/SelectableList.jsx
+++ b/app/components/SelectableList.jsx
@@ -9,7 +9,9 @@ let SelectableList = SelectableContainerEnhance(List)
 function wrapState(ComposedComponent) {
   const StateWrapper = React.createClass({
     getInitialState() {
-      return {selectedIndex: -1};
+      if(typeof this.props.initialIndex == 'undefined')
+        return {selectedIndex: -1};
+      return {selectedIndex: this.props.initialIndex};
     },
     setIndex(i, func){
       this.setState({