diff --git a/config/lang/en.json b/config/lang/en.json
index 4953f345..61f78c5c 100644
--- a/config/lang/en.json
+++ b/config/lang/en.json
@@ -97,6 +97,7 @@
   "sortByGenres": "By genres",
   "sortByDeveloper": "By developer",
   "sortByPublisher": "By publisher",
+  "noInternet": "Internet connection has been lost. Some features, including fetching games data on IGDB, will be disabled.",
   "genresNames": {
     "Point-and-click": "Point-and-click",
     "Fighting": "Fighting",
diff --git a/config/lang/fr.json b/config/lang/fr.json
index e7745115..a2124003 100644
--- a/config/lang/fr.json
+++ b/config/lang/fr.json
@@ -97,6 +97,7 @@
   "sortByGenres": "Par genres",
   "sortByDeveloper": "Par développeur",
   "sortByPublisher": "Par éditeur",
+  "noInternet": "La connexion internet a été perdue. Certains fonctionnalités, dont la récupération de données sur IGDB, seront désactivées.",
   "genresNames": {
     "Point-and-click": "Point-and-click",
     "Fighting": "Combat",
diff --git a/sources/client/app/AppState.ts b/sources/client/app/AppState.ts
index 7361299c..01ec9563 100644
--- a/sources/client/app/AppState.ts
+++ b/sources/client/app/AppState.ts
@@ -21,11 +21,12 @@ import {
 	settingsModalVisible,
 	timePlayedEditionModalVisible
 } from './reducers/modals';
-import { modulesConfig, settings } from './reducers/settings';
+import { internetConnection, modulesConfig, settings } from './reducers/settings';
 
 export interface AppState {
 	settings: any;
 	modulesConfig: any;
+	internetConnection: boolean;
 	potentialGames: GamesCollection<PotentialGame>;
 	playableGames: GamesCollection<PlayableGame>;
 	selectedGame: PlayableGame;
@@ -44,6 +45,7 @@ export interface AppState {
 export const vitrineStore: Store<AppState> = createStore(combineReducers({
 	settings,
 	modulesConfig,
+	internetConnection,
 	potentialGames,
 	playableGames,
 	selectedGame,
@@ -60,6 +62,7 @@ export const vitrineStore: Store<AppState> = createStore(combineReducers({
 }), {
 	settings: null,
 	modulesConfig: null,
+	internetConnection: true,
 	potentialGames: new GamesCollection<PotentialGame>(),
 	playableGames: new GamesCollection<PlayableGame>(),
 	selectedGame: null,
diff --git a/sources/client/app/actions/actionsTypes.ts b/sources/client/app/actions/actionsTypes.ts
index b480c138..8a42e4f6 100644
--- a/sources/client/app/actions/actionsTypes.ts
+++ b/sources/client/app/actions/actionsTypes.ts
@@ -6,6 +6,7 @@ export interface Action {
 export enum ActionType {
 	UPDATE_SETTINGS = 'UPDATE_SETTINGS',
 	UPDATE_MODULES_CONFIG = 'UPDATE_MODULES_CONFIG',
+	SET_INTERNET_CONNECTION = 'INTERNET_CONNECTION',
 
 	REFRESH_GAMES = 'REFRESH_GAMES',
 	ADD_POTENTIAL_GAMES = 'ADD_POTENTIAL_GAMES',
diff --git a/sources/client/app/actions/settings.ts b/sources/client/app/actions/settings.ts
index 7c6107e1..c4a2347c 100644
--- a/sources/client/app/actions/settings.ts
+++ b/sources/client/app/actions/settings.ts
@@ -17,3 +17,12 @@ export function updateModulesConfig(modulesConfig: any): Action {
 		}
 	};
 }
+
+export function setInternetConnection(internetConnection: boolean): Action {
+	return {
+		type: ActionType.SET_INTERNET_CONNECTION,
+		payload: {
+			internetConnection
+		}
+	};
+}
diff --git a/sources/client/app/components/App.tsx b/sources/client/app/components/App.tsx
index e47f43c6..e8bf6363 100644
--- a/sources/client/app/components/App.tsx
+++ b/sources/client/app/components/App.tsx
@@ -6,6 +6,7 @@ import * as React from 'react';
 
 import { getEnvFolder } from '../../../models/env';
 import { Vitrine } from '../containers/Vitrine';
+import { notify } from '../helpers';
 import { localizer } from '../Localizer';
 import { serverListener } from '../ServerListener';
 import { ErrorsWrapper } from './ErrorsWrapper';
@@ -14,6 +15,7 @@ interface Props {
 	settings: any;
 	updateSettings: (settings: any) => void;
 	updateModulesConfig: (modulesConfig: any) => void;
+	setInternetConnection: (internetConnection: boolean) => void;
 }
 
 interface State {
@@ -50,6 +52,14 @@ export class App extends React.Component<Props, State> {
 		});
 	}
 
+	private handleInternetConnection() {
+		this.props.setInternetConnection(window.navigator.onLine);
+
+		if (!window.navigator.onLine) {
+			notify(localizer.f('noInternet'), true, true);
+		}
+	}
+
 	public componentDidMount() {
 		serverListener.listen('init-settings', (settings: any, modulesConfig: any) => {
 			this.props.updateSettings(settings);
@@ -60,9 +70,18 @@ export class App extends React.Component<Props, State> {
 				serverListener.send('ready');
 			});
 		});
+		serverListener.listen('set-internet-connection', this.handleInternetConnection.bind(this));
+		window.addEventListener('online', this.handleInternetConnection.bind(this));
+		window.addEventListener('offline', this.handleInternetConnection.bind(this));
+
 		serverListener.send('settings-asked');
 	}
 
+	public componentWillUnmount() {
+		window.removeEventListener('online', this.handleInternetConnection.bind(this));
+		window.removeEventListener('offline', this.handleInternetConnection.bind(this));
+	}
+
 	public render(): JSX.Element {
 		return (this.state.settingsReceived) ? (
 			<ErrorsWrapper>
diff --git a/sources/client/app/components/GameAddModal.tsx b/sources/client/app/components/GameAddModal.tsx
index 059eed1b..ee58a80b 100644
--- a/sources/client/app/components/GameAddModal.tsx
+++ b/sources/client/app/components/GameAddModal.tsx
@@ -20,6 +20,7 @@ import { faFolderOpen } from '@fortawesome/fontawesome-free-solid';
 import { PlayableGame } from '../../../models/PlayableGame';
 
 interface Props {
+	internetConnection: boolean;
 	selectedGame: PlayableGame;
 	potentialGameToAdd: PotentialGame;
 	gameToEdit: PlayableGame;
@@ -515,7 +516,7 @@ export class GameAddModal extends VitrineComponent<Props, State> {
 					<Modal.Actions>
 						<Button
 							secondary={true}
-							disabled={!this.state.gameData.name}
+							disabled={!this.state.gameData.name || !this.props.internetConnection}
 							loading={this.state.igdbButtonLoading}
 							onClick={this.searchIgdbButton}
 						>
diff --git a/sources/client/app/containers/App.tsx b/sources/client/app/containers/App.tsx
index aeb44f21..23e9ca29 100644
--- a/sources/client/app/containers/App.tsx
+++ b/sources/client/app/containers/App.tsx
@@ -1,21 +1,24 @@
 import { connect, Dispatch } from 'react-redux';
 
 import { Action } from '../actions/actionsTypes';
-import { updateModulesConfig, updateSettings } from '../actions/settings';
+import { setInternetConnection, updateModulesConfig, updateSettings } from '../actions/settings';
 import { AppState } from '../AppState';
-import { App as VisualApp } from '../components/App';
+import { App as AppComponent } from '../components/App';
 
 const mapStateToProps = (state: AppState) => ({
 	settings: state.settings
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	updateSettings: (settings: any) => {
+	updateSettings(settings: any) {
 		dispatch(updateSettings(settings));
 	},
-	updateModulesConfig: (modulesConfig: any) => {
+	updateModulesConfig(modulesConfig: any) {
 		dispatch(updateModulesConfig(modulesConfig));
+	},
+	setInternetConnection(internetConnection: boolean) {
+		dispatch(setInternetConnection(internetConnection));
 	}
 });
 
-export const App = connect(mapStateToProps, mapDispatchToProps)(VisualApp);
+export const App = connect(mapStateToProps, mapDispatchToProps)(AppComponent);
diff --git a/sources/client/app/containers/ContextMenu.tsx b/sources/client/app/containers/ContextMenu.tsx
index 3dbad801..e5648e5b 100644
--- a/sources/client/app/containers/ContextMenu.tsx
+++ b/sources/client/app/containers/ContextMenu.tsx
@@ -5,25 +5,25 @@ import { Action } from '../actions/actionsTypes';
 import { launchGame, setGameToEdit } from '../actions/games';
 import { openGameAddModal, openTimePlayedEditionModal } from '../actions/modals';
 import { AppState } from '../AppState';
-import { ContextMenu as VisualContextMenu } from '../components/ContextMenu';
+import { ContextMenu as ContextMenuComponent } from '../components/ContextMenu';
 
 const mapStateToProps = (state: AppState) => ({
 	playableGames: state.playableGames
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	launchGame: (launchedGame: PlayableGame) => {
+	launchGame(launchedGame: PlayableGame) {
 		dispatch(launchGame(launchedGame));
 	},
-	setGameToEdit: (gameToEdit: PlayableGame) => {
+	setGameToEdit(gameToEdit: PlayableGame) {
 		dispatch(setGameToEdit(gameToEdit));
 	},
-	openGameAddModal: () => {
+	openGameAddModal() {
 		dispatch(openGameAddModal());
 	},
-	openTimePlayedEditionModal: () => {
+	openTimePlayedEditionModal() {
 		dispatch(openTimePlayedEditionModal());
 	}
 });
 
-export const ContextMenu = connect(mapStateToProps, mapDispatchToProps)(VisualContextMenu);
+export const ContextMenu = connect(mapStateToProps, mapDispatchToProps)(ContextMenuComponent);
diff --git a/sources/client/app/containers/EmulatorSettingsRow.tsx b/sources/client/app/containers/EmulatorSettingsRow.tsx
index 9fa82381..48ac5fb4 100644
--- a/sources/client/app/containers/EmulatorSettingsRow.tsx
+++ b/sources/client/app/containers/EmulatorSettingsRow.tsx
@@ -1,7 +1,7 @@
-import { connect, Dispatch } from 'react-redux';
+import { connect } from 'react-redux';
 
 import { AppState } from '../AppState';
-import { EmulatorSettingsRow as VisualEmulatorSettingsRow } from '../components/EmulatorSettingsRow';
+import { EmulatorSettingsRow as EmulatorSettingsRowComponent } from '../components/EmulatorSettingsRow';
 
 const mapStateToProps = (state: AppState) => ({
 	platforms: state.modulesConfig.emulated.platforms,
@@ -9,4 +9,4 @@ const mapStateToProps = (state: AppState) => ({
 
 const mapDispatchToProps = () => ({});
 
-export const EmulatorSettingsRow = connect(mapStateToProps, mapDispatchToProps)(VisualEmulatorSettingsRow);
+export const EmulatorSettingsRow = connect(mapStateToProps, mapDispatchToProps)(EmulatorSettingsRowComponent);
diff --git a/sources/client/app/containers/GameAddModal.tsx b/sources/client/app/containers/GameAddModal.tsx
index 303b57f6..f1798a70 100644
--- a/sources/client/app/containers/GameAddModal.tsx
+++ b/sources/client/app/containers/GameAddModal.tsx
@@ -4,11 +4,12 @@ import { PlayableGame } from '../../../models/PlayableGame';
 import { PotentialGame } from '../../../models/PotentialGame';
 import { Action } from '../actions/actionsTypes';
 import { addPlayableGames, editPlayableGame, selectGame, setGameToEdit, setPotentialGameToAdd } from '../actions/games';
-import { closeGameAddModal, closeIgdbResearchModal, closeTimePlayedEditionModal, openIgdbResearchModal } from '../actions/modals';
+import { closeGameAddModal, closeIgdbResearchModal, closeTimePlayedEditionModal } from '../actions/modals';
 import { AppState } from '../AppState';
-import { GameAddModal as VisualGameAddModal } from '../components/GameAddModal';
+import { GameAddModal as GameAddModalComponent } from '../components/GameAddModal';
 
 const mapStateToProps = (state: AppState) => ({
+	internetConnection: state.internetConnection,
 	selectedGame: state.selectedGame,
 	potentialGameToAdd: state.potentialGameToAdd,
 	gameToEdit: state.gameToEdit,
@@ -17,30 +18,30 @@ const mapStateToProps = (state: AppState) => ({
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	addPlayableGames: (playableGames: PlayableGame[]) => {
+	addPlayableGames(playableGames: PlayableGame[]) {
 		dispatch(addPlayableGames(playableGames));
 	},
-	editPlayableGame: (playableGame: PlayableGame) => {
+	editPlayableGame(playableGame: PlayableGame) {
 		dispatch(editPlayableGame(playableGame));
 	},
-	setPotentialGameToAdd: (potentialGame: PotentialGame) => {
+	setPotentialGameToAdd(potentialGame: PotentialGame) {
 		dispatch(setPotentialGameToAdd(potentialGame));
 	},
-	setGameToEdit: (playableGame: PlayableGame) => {
+	setGameToEdit(playableGame: PlayableGame) {
 		dispatch(setGameToEdit(playableGame));
 	},
-	selectGame: (selectedGame: PlayableGame) => {
+	selectGame(selectedGame: PlayableGame) {
 		dispatch(selectGame(selectedGame));
 	},
-	closeGameAddModal: () => {
+	closeGameAddModal() {
 		dispatch(closeGameAddModal());
 	},
-	closeIgdbResearchModal: () => {
+	closeIgdbResearchModal() {
 		dispatch(closeIgdbResearchModal());
 	},
-	closeTimePlayedEditionModal: () => {
+	closeTimePlayedEditionModal() {
 		dispatch(closeTimePlayedEditionModal());
 	}
 });
 
-export const GameAddModal = connect(mapStateToProps, mapDispatchToProps)(VisualGameAddModal);
+export const GameAddModal = connect(mapStateToProps, mapDispatchToProps)(GameAddModalComponent);
diff --git a/sources/client/app/containers/GameContainer.tsx b/sources/client/app/containers/GameContainer.tsx
index 8851fa90..cc712283 100644
--- a/sources/client/app/containers/GameContainer.tsx
+++ b/sources/client/app/containers/GameContainer.tsx
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 
 import { AppState } from '../AppState';
-import { GameContainer as VisualGameContainer } from '../components/GameContainer';
+import { GameContainer as GameContainerComponent } from '../components/GameContainer';
 
 const mapStateToProps = (state: AppState) => ({
 	selectedGame: state.selectedGame
@@ -9,4 +9,4 @@ const mapStateToProps = (state: AppState) => ({
 
 const mapDispatchToProps = () => ({});
 
-export const GameContainer = connect(mapStateToProps, mapDispatchToProps)(VisualGameContainer);
+export const GameContainer = connect(mapStateToProps, mapDispatchToProps)(GameContainerComponent);
diff --git a/sources/client/app/containers/IgdbResearchModal.tsx b/sources/client/app/containers/IgdbResearchModal.tsx
index bf419f9f..106f61c3 100644
--- a/sources/client/app/containers/IgdbResearchModal.tsx
+++ b/sources/client/app/containers/IgdbResearchModal.tsx
@@ -3,19 +3,19 @@ import { connect, Dispatch } from 'react-redux';
 import { Action } from '../actions/actionsTypes';
 import { closeIgdbResearchModal, openIgdbResearchModal } from '../actions/modals';
 import { AppState } from '../AppState';
-import { IgdbResearchModal as VisualIgdbResearchModal } from '../components/IgdbResearchModal';
+import { IgdbResearchModal as IgdbResearchModalComponent } from '../components/IgdbResearchModal';
 
 const mapStateToProps = (state: AppState) => ({
 	visible: state.igdbResearchModalVisible
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	openIgdbResearchModal: () => {
+	openIgdbResearchModal() {
 		dispatch(openIgdbResearchModal());
 	},
-	closeIgdbResearchModal: () => {
+	closeIgdbResearchModal() {
 		dispatch(closeIgdbResearchModal());
 	}
 });
 
-export const IgdbResearchModal = connect(mapStateToProps, mapDispatchToProps)(VisualIgdbResearchModal);
+export const IgdbResearchModal = connect(mapStateToProps, mapDispatchToProps)(IgdbResearchModalComponent);
diff --git a/sources/client/app/containers/PotentialGamesAddModal.tsx b/sources/client/app/containers/PotentialGamesAddModal.tsx
index 80313edc..5deb52d7 100644
--- a/sources/client/app/containers/PotentialGamesAddModal.tsx
+++ b/sources/client/app/containers/PotentialGamesAddModal.tsx
@@ -5,7 +5,7 @@ import { Action } from '../actions/actionsTypes';
 import { setPotentialGameToAdd } from '../actions/games';
 import { closePotentialGamesAddModal, openGameAddModal } from '../actions/modals';
 import { AppState } from '../AppState';
-import { PotentialGamesAddModal as VisualPotentialGamesAddModal } from '../components/PotentialGamesAddModal';
+import { PotentialGamesAddModal as PotentialGamesAddModalComponent } from '../components/PotentialGamesAddModal';
 
 const mapStateToProps = (state: AppState) => ({
 	potentialGames: state.potentialGames,
@@ -13,15 +13,15 @@ const mapStateToProps = (state: AppState) => ({
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	setPotentialGameToAdd: (potentialGame: PotentialGame) => {
+	setPotentialGameToAdd(potentialGame: PotentialGame) {
 		dispatch(setPotentialGameToAdd(potentialGame));
 	},
-	openGameAddModal: () => {
+	openGameAddModal() {
 		dispatch(openGameAddModal());
 	},
-	closePotentialGamesAddModal: () => {
+	closePotentialGamesAddModal() {
 		dispatch(closePotentialGamesAddModal());
 	}
 });
 
-export const PotentialGamesAddModal = connect(mapStateToProps, mapDispatchToProps)(VisualPotentialGamesAddModal);
+export const PotentialGamesAddModal = connect(mapStateToProps, mapDispatchToProps)(PotentialGamesAddModalComponent);
diff --git a/sources/client/app/containers/SettingsModal.tsx b/sources/client/app/containers/SettingsModal.tsx
index 73eb48c5..018c698e 100644
--- a/sources/client/app/containers/SettingsModal.tsx
+++ b/sources/client/app/containers/SettingsModal.tsx
@@ -4,7 +4,7 @@ import { Action } from '../actions/actionsTypes';
 import { closeSettingsModal } from '../actions/modals';
 import { updateSettings } from '../actions/settings';
 import { AppState } from '../AppState';
-import { SettingsModal as VisualSettingsModal } from '../components/SettingsModal';
+import { SettingsModal as SettingsModalComponent } from '../components/SettingsModal';
 
 const mapStateToProps = (state: AppState) => ({
 	settings: state.settings,
@@ -13,12 +13,12 @@ const mapStateToProps = (state: AppState) => ({
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	updateSettings: (settings: any) => {
+	updateSettings(settings: any) {
 		dispatch(updateSettings(settings));
 	},
-	closeSettingsModal: () => {
+	closeSettingsModal() {
 		dispatch(closeSettingsModal());
 	}
 });
 
-export const SettingsModal = connect(mapStateToProps, mapDispatchToProps)(VisualSettingsModal);
+export const SettingsModal = connect(mapStateToProps, mapDispatchToProps)(SettingsModalComponent);
diff --git a/sources/client/app/containers/SideBar.tsx b/sources/client/app/containers/SideBar.tsx
index a519e22a..35de7a89 100644
--- a/sources/client/app/containers/SideBar.tsx
+++ b/sources/client/app/containers/SideBar.tsx
@@ -5,7 +5,7 @@ import { Action } from '../actions/actionsTypes';
 import { refreshGames, selectGame, sortGames } from '../actions/games';
 import { openGameAddModal, openPotentialGamesAddModal, openSettingsModal } from '../actions/modals';
 import { AppState } from '../AppState';
-import { SideBar as VisualSideBar } from '../components/SideBar';
+import { SideBar as SideBarComponent } from '../components/SideBar';
 
 const mapStateToProps = (state: AppState) => ({
 	potentialGames: state.potentialGames,
@@ -16,24 +16,24 @@ const mapStateToProps = (state: AppState) => ({
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	selectGame: (selectedGame: PlayableGame) => {
+	selectGame(selectedGame: PlayableGame) {
 		dispatch(selectGame(selectedGame));
 	},
-	refreshGames: () => {
+	refreshGames() {
 		dispatch(refreshGames());
 	},
-	sortGames: (gamesSortParameter: SortParameter) => {
+	sortGames(gamesSortParameter: SortParameter) {
 		dispatch(sortGames(gamesSortParameter));
 	},
-	openGameAddModal: () => {
+	openGameAddModal() {
 		dispatch(openGameAddModal());
 	},
-	openPotentialGamesAddModal: () => {
+	openPotentialGamesAddModal() {
 		dispatch(openPotentialGamesAddModal());
 	},
-	openSettingsModal: () => {
+	openSettingsModal() {
 		dispatch(openSettingsModal());
 	}
 });
 
-export const SideBar = connect(mapStateToProps, mapDispatchToProps)(VisualSideBar);
+export const SideBar = connect(mapStateToProps, mapDispatchToProps)(SideBarComponent);
diff --git a/sources/client/app/containers/TimePlayedEditionModal.tsx b/sources/client/app/containers/TimePlayedEditionModal.tsx
index 74e61549..255dbe2f 100644
--- a/sources/client/app/containers/TimePlayedEditionModal.tsx
+++ b/sources/client/app/containers/TimePlayedEditionModal.tsx
@@ -3,7 +3,7 @@ import { connect, Dispatch } from 'react-redux';
 import { Action } from '../actions/actionsTypes';
 import { closeTimePlayedEditionModal } from '../actions/modals';
 import { AppState } from '../AppState';
-import { TimePlayedEditionModal as VisualTimePlayedEditionModal } from '../components/TimePlayedEditionModal';
+import { TimePlayedEditionModal as TimePlayedEditionModalComponent } from '../components/TimePlayedEditionModal';
 
 const mapStateToProps = (state: AppState) => ({
 	gameToEdit: state.gameToEdit,
@@ -11,9 +11,9 @@ const mapStateToProps = (state: AppState) => ({
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	closeTimePlayedEditionModal: () => {
+	closeTimePlayedEditionModal() {
 		dispatch(closeTimePlayedEditionModal());
 	}
 });
 
-export const TimePlayedEditionModal = connect(mapStateToProps, mapDispatchToProps)(VisualTimePlayedEditionModal);
+export const TimePlayedEditionModal = connect(mapStateToProps, mapDispatchToProps)(TimePlayedEditionModalComponent);
diff --git a/sources/client/app/containers/Vitrine.tsx b/sources/client/app/containers/Vitrine.tsx
index 2a4eec1e..c1166e88 100644
--- a/sources/client/app/containers/Vitrine.tsx
+++ b/sources/client/app/containers/Vitrine.tsx
@@ -7,7 +7,7 @@ import { addPlayableGames, addPotentialGames, launchGame, removePlayableGame, se
 import { closeSettingsModal, openSettingsModal } from '../actions/modals';
 import { updateSettings } from '../actions/settings';
 import { AppState } from '../AppState';
-import { Vitrine as VisualVitrine } from '../components/Vitrine';
+import { Vitrine as VitrineComponent } from '../components/Vitrine';
 
 const mapStateToProps = (state: AppState) => ({
 	settings: state.settings,
@@ -22,33 +22,33 @@ const mapStateToProps = (state: AppState) => ({
 });
 
 const mapDispatchToProps = (dispatch: Dispatch<Action>) => ({
-	updateSettings: (settings: any) => {
+	updateSettings(settings: any) {
 		dispatch(updateSettings(settings));
 	},
-	addPotentialGames: (potentialGames: PotentialGame[]) => {
+	addPotentialGames(potentialGames: PotentialGame[]) {
 		dispatch(addPotentialGames(potentialGames));
 	},
-	addPlayableGames: (playableGames: PlayableGame[]) => {
+	addPlayableGames(playableGames: PlayableGame[]) {
 		dispatch(addPlayableGames(playableGames));
 	},
-	removePlayableGame: (gameUuid: string) => {
+	removePlayableGame(gameUuid: string) {
 		dispatch(removePlayableGame(gameUuid));
 	},
-	launchGame: (launchedGame: PlayableGame) => {
+	launchGame(launchedGame: PlayableGame) {
 		dispatch(launchGame(launchedGame));
 	},
-	stopGame: (playedGame: PlayableGame) => {
+	stopGame(playedGame: PlayableGame) {
 		dispatch(stopGame(playedGame));
 	},
-	selectGame: (selectedGame: PlayableGame) => {
+	selectGame(selectedGame: PlayableGame) {
 		dispatch(selectGame(selectedGame));
 	},
-	openSettingsModal: () => {
+	openSettingsModal() {
 		dispatch(openSettingsModal());
 	},
-	closeSettingsModal: () => {
+	closeSettingsModal() {
 		dispatch(closeSettingsModal());
 	}
 });
 
-export const Vitrine = connect(mapStateToProps, mapDispatchToProps)(VisualVitrine);
+export const Vitrine = connect(mapStateToProps, mapDispatchToProps)(VitrineComponent);
diff --git a/sources/client/app/helpers.tsx b/sources/client/app/helpers.tsx
index fb7462a5..b58ab580 100644
--- a/sources/client/app/helpers.tsx
+++ b/sources/client/app/helpers.tsx
@@ -80,7 +80,7 @@ export function urlify(imgPath: string): string {
 	return (imgPath) ? ('url(' + imgPath.replace(/\\/g, '\\\\') + ')') : ('');
 }
 
-export function notify(content: string, minor?: boolean) {
+export function notify(content: string, minor?: boolean, noAutoClose?: boolean) {
 	const toastStyle: React.CSSProperties & any = StyleSheet.create({
 		notification: {
 			background: (!minor) ? rgba(216, 147, 98, 0.85) : (rgba(90, 85, 81, 0.60)),
@@ -93,7 +93,7 @@ export function notify(content: string, minor?: boolean) {
 		position: 'bottom-right',
 		className: css(toastStyle.notification),
 		hideProgressBar: true,
-		autoClose: (!minor) ? (5000) : (3500)
+		autoClose: (noAutoClose) ? (false) : ((!minor) ? (5000) : (3500))
 	});
 }
 
diff --git a/sources/client/app/reducers/settings.ts b/sources/client/app/reducers/settings.ts
index 96499dcf..36603f9f 100644
--- a/sources/client/app/reducers/settings.ts
+++ b/sources/client/app/reducers/settings.ts
@@ -17,3 +17,12 @@ export function modulesConfig(state: any = {}, action: Action): any {
 			return state;
 	}
 }
+
+export function internetConnection(state: boolean = true, action: Action): boolean {
+	switch (action.type) {
+		case ActionType.SET_INTERNET_CONNECTION:
+			return action.payload.internetConnection;
+		default:
+			return state;
+	}
+}
diff --git a/sources/server/Server.ts b/sources/server/Server.ts
index 09d0bb40..be92600c 100644
--- a/sources/server/Server.ts
+++ b/sources/server/Server.ts
@@ -82,7 +82,8 @@ export class Server {
 			}
 		}
 		catch (error) {
-			this.throwServerError(error);
+			logger.info('Server', 'Internet is offline, aborting updates checking.');
+			this.windowsHandler.sendToLoader('no-update-found');
 		}
 	}