diff --git a/homeassistant/components/hangouts/__init__.py b/homeassistant/components/hangouts/__init__.py
index 89649ecb8e1..8ebacc3736b 100644
--- a/homeassistant/components/hangouts/__init__.py
+++ b/homeassistant/components/hangouts/__init__.py
@@ -26,8 +26,8 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup(hass, config):
     """Set up the Hangouts bot component."""
-    config = config.get(DOMAIN, [])
-    hass.data[DOMAIN] = {CONF_COMMANDS: config[CONF_COMMANDS]}
+    config = config.get(DOMAIN, {})
+    hass.data[DOMAIN] = {CONF_COMMANDS: config.get(CONF_COMMANDS, [])}
 
     if configured_hangouts(hass) is None:
         hass.async_add_job(hass.config_entries.flow.async_init(
diff --git a/homeassistant/components/hangouts/config_flow.py b/homeassistant/components/hangouts/config_flow.py
index bd81d5053c8..74eb14b050d 100644
--- a/homeassistant/components/hangouts/config_flow.py
+++ b/homeassistant/components/hangouts/config_flow.py
@@ -104,4 +104,4 @@ class HangoutsFlowHandler(data_entry_flow.FlowHandler):
 
     async def async_step_import(self, _):
         """Handle a flow import."""
-        return self.async_abort(reason='already_configured')
+        return await self.async_step_user()