diff --git a/src/device-plugins/logs/index.js b/src/device-plugins/logs/index.js
index d7cc098fb..98d1d78eb 100644
--- a/src/device-plugins/logs/index.js
+++ b/src/device-plugins/logs/index.js
@@ -15,6 +15,7 @@ import type {Counter} from './LogWatcher.js';
 import type {DeviceLogEntry} from '../../devices/BaseDevice.js';
 import type {Props as PluginProps} from '../../plugin';
 
+import * as React from 'react';
 import {
   Text,
   ManagedTable,
@@ -24,9 +25,10 @@ import {
   FlexColumn,
   Glyph,
   SonarSidebar,
+  SonarDevicePlugin,
+  SearchableTable,
   styled,
 } from 'sonar';
-import {SonarDevicePlugin, SearchableTable} from 'sonar';
 import textContent from '../../utils/textContent.js';
 import createPaste from '../../utils/createPaste.js';
 import LogWatcher from './LogWatcher';
diff --git a/src/ui/components/Button.js b/src/ui/components/Button.js
index 6f31820f4..5f231d294 100644
--- a/src/ui/components/Button.js
+++ b/src/ui/components/Button.js
@@ -5,13 +5,14 @@
  * @format
  */
 
+import * as React from 'react';
 import Glyph from './Glyph.js';
-import styled from '../styled/index.js';
-import {findDOMNode} from 'react-dom';
 import PropTypes from 'prop-types';
+import electron from 'electron';
+import styled from '../styled/index.js';
 import {colors} from './colors.js';
 import {connect} from 'react-redux';
-import electron from 'electron';
+import {findDOMNode} from 'react-dom';
 import {keyframes} from 'react-emotion';
 
 const borderColor = props => {
diff --git a/src/ui/components/ContextMenu.js b/src/ui/components/ContextMenu.js
index fd58de30d..3e3b3e3d8 100644
--- a/src/ui/components/ContextMenu.js
+++ b/src/ui/components/ContextMenu.js
@@ -5,6 +5,7 @@
  * @format
  */
 
+import * as React from 'react';
 import FlexColumn from './FlexColumn.js';
 import PropTypes from 'prop-types';