diff --git a/src/containers/scanning-step.jsx b/src/containers/scanning-step.jsx
index ecc19318913845154c248f716dfad6d440147c2e..035af7400ce74b931baf285f55a99fb10de511fe 100644
--- a/src/containers/scanning-step.jsx
+++ b/src/containers/scanning-step.jsx
@@ -32,7 +32,10 @@ class ScanningStep extends React.Component {
             'PERIPHERAL_SCAN_TIMEOUT', this.handlePeripheralScanTimeout);
     }
     handlePeripheralScanTimeout () {
-        this.setState({scanning: false});
+        this.setState({
+            scanning: false,
+            deviceList: []
+        });
     }
     handlePeripheralListUpdate (newList) {
         // TODO: sort peripherals by signal strength? so they don't jump around
@@ -58,6 +61,7 @@ class ScanningStep extends React.Component {
                 onConnected={this.props.onConnected}
                 onConnecting={this.props.onConnecting}
                 onRefresh={this.handleRefresh}
+                scanning={this.state.scanning}
             />
         );
     }