diff --git a/packages/rocketchat-ui-master/client/main.js b/packages/rocketchat-ui-master/client/main.js
index 17736ef86227..3921d3d1b3bb 100644
--- a/packages/rocketchat-ui-master/client/main.js
+++ b/packages/rocketchat-ui-master/client/main.js
@@ -4,7 +4,7 @@ import s from 'underscore.string';
 
 RocketChat.settings.collection.find({_id:/theme-color-rc/i}, {fields:{ value: 1 }}).observe({changed: () => { DynamicCss.run(true); }});
 
-this.isFirefox = navigator.userAgent.match(/Firefox\/(\d+)\.\d/);
+this.isFirefox = navigator.userAgent.match(/(Firefox|Chrome)\/(\d+)\.\d/);
 
 Template.body.onRendered(function() {
 	new Clipboard('.clipboard');
diff --git a/packages/rocketchat-ui/client/components/icon.js b/packages/rocketchat-ui/client/components/icon.js
index c16c92c2c1c8..ae4930109bde 100644
--- a/packages/rocketchat-ui/client/components/icon.js
+++ b/packages/rocketchat-ui/client/components/icon.js
@@ -3,5 +3,5 @@
 const firefoxBaseUrlFix = () => `${ window.location.origin }${ FlowRouter.current().path }`;
 
 Template.icon.helpers({
-	baseUrl: isFirefox && isFirefox[1] < 55 ? firefoxBaseUrlFix : undefined
+	baseUrl: isFirefox && isFirefox[2] < 55 ? firefoxBaseUrlFix : undefined
 });