diff --git a/common/util.js b/common/util.js
index 1e28d3a5..8551b1ef 100644
--- a/common/util.js
+++ b/common/util.js
@@ -16,8 +16,8 @@ module.exports.escapeRegExp = (str) => {
  */
 module.exports.getRegExp = (wildcard) => {
     const escaped = '^' + wildcard // search from start of line
-        .replace('.', '\\.')
-        .replace('*', '.*')
+        .replace(/\./g, '\\.')
+        .replace(/\*/g, '.*')
         .replace('?', '.?') + '$'; // search to end of line
     
     return RegExp(escaped);
diff --git a/common/util.spec.js b/common/util.spec.js
index 3393dc6c..c9227b46 100644
--- a/common/util.spec.js
+++ b/common/util.spec.js
@@ -93,6 +93,13 @@ test('util: getRegExp', (t) => {
     t.end();
 });
 
+test('util: getRegExp: dots', (t) => {
+    const reg = getRegExp('h.*el?o.*');
+    
+    t.deepEqual(reg, /^h\..*el.?o\..*$/, 'should return regexp');
+    t.end();
+});
+
 test('util: getRegExp: no', (t) => {
     const reg = getRegExp('');