diff --git a/public/application.js b/public/application.js
index 19bb411ef2..7aaf1c5df4 100644
--- a/public/application.js
+++ b/public/application.js
@@ -15,6 +15,13 @@ angular.element(document).ready(function() {
 	//Fixing facebook bug with redirect
 	if (window.location.hash === '#_=_') window.location.hash = '#!';
 
+	// Fixing google bug with redirect
+	if (window.location.href[window.location.href.length - 1] === '#' &&
+			// for just the error url (origin + /#)
+			(window.location.href.length - window.location.origin.length) === 2) {
+			window.location.href = window.location.origin + '/#!';
+	}
+
 	//Then init the app
 	angular.bootstrap(document, [ApplicationConfiguration.applicationModuleName]);
-});
\ No newline at end of file
+});