diff --git a/client/src/js/components/ui/Editable.js b/client/src/js/components/ui/Editable.js
index 5b14e80e..78de4ead 100644
--- a/client/src/js/components/ui/Editable.js
+++ b/client/src/js/components/ui/Editable.js
@@ -27,7 +27,7 @@ export default class Editable extends PureComponent {
     if (this.input) {
       const style = window.getComputedStyle(this.input);
       const padding = parseInt(style.paddingRight, 10);
-      // Make sure the width is atleast 1px so the caret always shows
+      // Make sure the width is at least 1px so the caret always shows
       const width =
         stringWidth(value, `${style.fontSize} ${style.fontFamily}`) || 1;
 
diff --git a/client/src/js/state/__tests__/reducer-messages.test.js b/client/src/js/state/__tests__/reducer-messages.test.js
index 7b0eb880..e987d630 100644
--- a/client/src/js/state/__tests__/reducer-messages.test.js
+++ b/client/src/js/state/__tests__/reducer-messages.test.js
@@ -26,7 +26,7 @@ describe('message reducer', () => {
     });
   });
 
-  it('adds all the messsages on ADD_MESSAGES', () => {
+  it('adds all the messages on ADD_MESSAGES', () => {
     const state = reducer(undefined, {
       type: actions.ADD_MESSAGES,
       server: 'srv',
diff --git a/server/irc_handler.go b/server/irc_handler.go
index 534930b3..53da7f9e 100644
--- a/server/irc_handler.go
+++ b/server/irc_handler.go
@@ -99,7 +99,7 @@ func (i *ircHandler) join(msg *irc.Message) {
 	channelStore.AddUser(msg.Nick, i.client.Host, channel)
 
 	if msg.Nick == i.client.GetNick() {
-		// Incase no topic is set and theres a cached one that needs to be cleared
+		// In case no topic is set and there's a cached one that needs to be cleared
 		i.client.Topic(channel)
 
 		i.state.sendLastMessages(i.client.Host, channel, 50)