diff --git a/mode-tree.c b/mode-tree.c
index ddcfff75..1093aff3 100644
--- a/mode-tree.c
+++ b/mode-tree.c
@@ -595,7 +595,7 @@ mode_tree_search_for(struct mode_tree_data *mtd)
 			continue;
 		}
 		if (mtd->searchcb(mtd->modedata, mti->itemdata, mtd->ss))
-		    return (mti);
+			return (mti);
 	}
 	return (NULL);
 }
diff --git a/proc.c b/proc.c
index dabf462f..fa2b61b7 100644
--- a/proc.c
+++ b/proc.c
@@ -45,7 +45,7 @@ struct tmuxpeer {
 #define PEER_BAD 0x1
 
 	void		(*dispatchcb)(struct imsg *, void *);
-	void		*arg;
+	void		 *arg;
 };
 
 static int	peer_check_version(struct tmuxpeer *, struct imsg *);
diff --git a/tmux.h b/tmux.h
index 0f09f9fb..c9b42306 100644
--- a/tmux.h
+++ b/tmux.h
@@ -621,7 +621,7 @@ struct job {
 	job_free_cb		 freecb;
 	void			*data;
 
-	LIST_ENTRY(job)	 	 entry;
+	LIST_ENTRY(job)		 entry;
 };
 LIST_HEAD(joblist, job);
 
@@ -680,7 +680,7 @@ struct screen_write_ctx {
 	struct screen_write_collect_item *item;
 	struct screen_write_collect_line *list;
 	u_int			 scrolled;
-	u_int                    bg;
+	u_int			 bg;
 
 	u_int			 cells;
 	u_int			 written;
diff --git a/window-buffer.c b/window-buffer.c
index 2888b68c..daceafbe 100644
--- a/window-buffer.c
+++ b/window-buffer.c
@@ -237,7 +237,7 @@ window_buffer_search(__unused void *modedata, void *itemdata, const char *ss)
 	if ((pb = paste_get_name(item->name)) == NULL)
 		return (0);
 	if (strstr(item->name, ss) != NULL)
-		return (0);
+		return (1);
 	bufdata = paste_buffer_data(pb, &bufsize);
 	return (memmem(bufdata, bufsize, ss, strlen(ss)) != NULL);
 }