diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js
index 523926a2..056e7fff 100644
--- a/browser/components/CodeEditor.js
+++ b/browser/components/CodeEditor.js
@@ -120,14 +120,11 @@ export default class CodeEditor extends React.Component {
     const { storageKey, noteKey } = this.props
     const storage = findStorage(storageKey)
     if (storage)
-      sendWakatimeHeartBeat(
-        storage.path,
-        noteKey,
-        storage.name,
-        false,
-        false,
-        true
-      )
+      sendWakatimeHeartBeat(storage.path, noteKey, storage.name, {
+        isWrite: false,
+        hasFileChanges: false,
+        isFileChange: true
+      })
   }
 
   handleSearch(msg) {
@@ -813,25 +810,17 @@ export default class CodeEditor extends React.Component {
     const storage = findStorage(storageKey)
     if (this.props.onChange) {
       this.props.onChange(editor)
-      if (storage)
-        sendWakatimeHeartBeat(
-          storage.path,
-          noteKey,
-          storage.name,
-          true,
-          true,
-          false
-        )
-    } else {
-      if (storage)
-        sendWakatimeHeartBeat(
-          storage.path,
-          noteKey,
-          storage.name,
-          false,
-          false,
-          false
-        )
+    }
+
+    const isWrite = !!this.props.onChange
+    const hasFileChanges = isWrite
+
+    if (storage) {
+      sendWakatimeHeartBeat(storage.path, noteKey, storage.name, {
+        isWrite,
+        hasFileChanges,
+        isFileChange: false
+      })
     }
   }
 
@@ -965,14 +954,11 @@ export default class CodeEditor extends React.Component {
     const { storageKey, noteKey } = this.props
     const storage = findStorage(storageKey)
     if (storage)
-      sendWakatimeHeartBeat(
-        storage.path,
-        noteKey,
-        storage.name,
-        false,
-        false,
-        true
-      )
+      sendWakatimeHeartBeat(storage.path, noteKey, storage.name, {
+        isWrite: false,
+        hasFileChanges: false,
+        isFileChange: true
+      })
   }
 
   setValue(value) {
diff --git a/browser/lib/wakatime-plugin.js b/browser/lib/wakatime-plugin.js
index b2ed9307..9b1233df 100644
--- a/browser/lib/wakatime-plugin.js
+++ b/browser/lib/wakatime-plugin.js
@@ -7,9 +7,7 @@ function sendWakatimeHeartBeat(
   storagePath,
   noteKey,
   storageName,
-  isWrite,
-  hasFileChanges,
-  isFileChange
+  { isWrite, hasFileChanges, isFileChange }
 ) {
   if (
     config.get().wakatime.isActive &&