diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index dc24aa1..373e447 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -10,7 +10,7 @@ import { fetchInstances } from './redux/actions';
 import { IAppState, IInstance } from './redux/types';
 
 interface IAppProps {
-  currentInstance: IInstance;
+  currentInstance: IInstance | null;
   instances?: IInstance[],
   isLoadingInstances: boolean,
   fetchInstances: () => void;
@@ -56,13 +56,15 @@ class AppImpl extends React.Component<IAppProps> {
 
   private renderGraph = () => {
     return (
-      <NonIdealState
-        className="fediverse-welcome"
-        icon={IconNames.SEARCH_AROUND}
-        title="Graph. TODO"
-        description={"Selected " + this.props.currentInstance.name}
-      />
-    )
+      <div>
+        <NonIdealState
+          className="fediverse-welcome"
+          icon={IconNames.SEARCH_AROUND}
+          title="Graph. TODO"
+          description={"Selected " + ((this.props.currentInstance && this.props.currentInstance.name) || "nothing")}
+        />
+      </div>
+    );
   }
 
 }
diff --git a/frontend/src/components/InstanceSearch.tsx b/frontend/src/components/InstanceSearch.tsx
index 7ca9dfc..ccf3ac9 100644
--- a/frontend/src/components/InstanceSearch.tsx
+++ b/frontend/src/components/InstanceSearch.tsx
@@ -1,62 +1,68 @@
 import * as React from 'react';
 import { connect } from 'react-redux';
+// import { List, ListRowProps } from 'react-virtualized';
 import { Dispatch } from 'redux';
 
-import { MenuItem } from '@blueprintjs/core';
-import { IItemRendererProps, Suggest } from '@blueprintjs/select';
+import { Button, MenuItem } from '@blueprintjs/core';
+import { IconNames } from '@blueprintjs/icons';
+import { ItemPredicate, ItemRenderer, Select } from '@blueprintjs/select';
 
 import { selectInstance } from '../redux/actions';
 import { IAppState, IInstance } from '../redux/types';
 
 interface IInstanceSearchProps {
-    currentInstance: IInstance;
+    currentInstance: IInstance | null;
     instances?: IInstance[];
     selectInstance: (instanceName: string) => void;
 }
 
+const InstanceSelect = Select.ofType<IInstance>();
+
 class InstanceSearchImpl extends React.Component<IInstanceSearchProps> {
 
     public render() {
         return (
-            <Suggest
-                inputValueRenderer={this.inputValueRenderer}
+            <InstanceSelect
+                items={this.props.instances && this.props.instances.slice(50) || []}
                 itemRenderer={this.itemRenderer}
-                items={this.props.instances || []}
                 onItemSelect={this.onItemSelect}
-                // itemListRenderer={this.itemListRenderer}
+                itemPredicate={this.itemPredicate}
+                disabled={!this.props.instances}
+            >
+                <Button
+                    icon={IconNames.SELECTION}
+                    rightIcon={IconNames.CARET_DOWN}
+                    text={(this.props.currentInstance && this.props.currentInstance.name) || ("Select an instance")}
+                    disabled={!this.props.instances}
+                />
+            </InstanceSelect>
+        );
+    }
+
+    private itemRenderer: ItemRenderer<IInstance> = (item, { handleClick, modifiers }) => {
+        if (!modifiers.matchesPredicate) {
+            return null;
+        }
+        return (
+            <MenuItem
+                text={item.name}
+                key={item.name}
+                active={modifiers.active}
+                onClick={handleClick}
             />
-        )
+        );
     }
 
-    private inputValueRenderer = (item: IInstance): string => {
-        return item.name;
-    }
-
-    private itemRenderer = (item: IInstance, itemProps: IItemRendererProps): JSX.Element => {
-        return <MenuItem label={item.name} key={item.name} />;
+    private itemPredicate: ItemPredicate<IInstance> = (query, item, index) => {
+        if (!item.name) {
+            return false;
+        }
+        return item.name.toLowerCase().indexOf(query.toLowerCase()) >= 0;
     }
 
     private onItemSelect = (item: IInstance, event?: React.SyntheticEvent<HTMLElement>) => {
         this.props.selectInstance(item.name);
     }
-
-    // private itemListRenderer = (itemListProps: IItemListRendererProps<IInstance>): JSX.Element => {
-    //     return (
-    //         <List
-    //             height={350}
-    //             rowHeight={30}
-    //             rowCount={(this.props.instances && this.props.instances.length) || 0}
-    //             // tslint:disable-next-line
-    //             rowRenderer={this.rowRenderer}
-    //             width={214}
-    //         />
-    //     )
-    // }
-
-    // private rowRenderer = (listRowProps: ListRowProps) => {
-    //     const instanceName = (this.props.instances && this.props.instances[listRowProps.index].name) || "";
-    //     return <MenuItem label={instanceName} key={instanceName} />;
-    // }
 }
 
 const mapStateToProps = (state: IAppState) => ({
diff --git a/frontend/src/index.css b/frontend/src/index.css
index 8a8dd64..b308513 100644
--- a/frontend/src/index.css
+++ b/frontend/src/index.css
@@ -12,15 +12,7 @@ html, body {
 }
 
 .fediverse-instance-search-popover {
-  max-height: 350px;
+  height: 350px;
   min-width: 214px;
-  overflow: scroll;
   overflow-x: hidden;
-  text-align: left;
 }
-
-.fediverse-instance-search-popover-empty-state {
-  padding: 10px;
-  width: 214px;
-  height: 60px;
-}
\ No newline at end of file
diff --git a/frontend/src/redux/reducers.ts b/frontend/src/redux/reducers.ts
index 5be56cd..4cb1b07 100644
--- a/frontend/src/redux/reducers.ts
+++ b/frontend/src/redux/reducers.ts
@@ -24,8 +24,7 @@ const data = (state: IDataState = initialDataState, action: IAction) => {
     }
 }
 
-const initialInstanceState = {'name': 'mastodon.social'}
-const currentInstance = (state: IInstance = initialInstanceState, action: IAction): IInstance => {
+const currentInstance = (state: IInstance | null = null, action: IAction): IInstance | null => {
     switch (action.type) {
         case ActionType.SELECT_INSTANCE:
             return action.payload;
diff --git a/frontend/src/redux/types.ts b/frontend/src/redux/types.ts
index fa581b8..18e560f 100644
--- a/frontend/src/redux/types.ts
+++ b/frontend/src/redux/types.ts
@@ -9,10 +9,6 @@ export interface IAction {
     payload: any,
 }
 
-export interface IInstanceState {
-    currentInstance?: string,
-}
-
 export interface IInstance {
     name: string,
     numUsers?: number,
@@ -24,6 +20,6 @@ export interface IDataState {
 }
 
 export interface IAppState {
-    currentInstance: IInstance,
+    currentInstance: IInstance | null,
     data: IDataState,
-}
\ No newline at end of file
+}