diff --git a/functions.php b/functions.php
index 91fa618..bb1c06b 100644
--- a/functions.php
+++ b/functions.php
@@ -408,9 +408,10 @@ function themeprefix_cpt_layout() {
 add_filter( 'genesis_site_layout', 'themeprefix_cpt_layout' );
 
 // Change number or products per row to 3
-add_filter('loop_shop_columns', 'loop_columns');
-if (!function_exists('loop_columns')) {
-	function loop_columns() {
-		return 3; // 3 products per row
+add_filter( 'loop_shop_columns', 'tm_product_columns', 5);
+function tm_product_columns($columns) {
+	if ( is_shop() || is_product_category() || is_product_tag() ) {
+		$columns = 3;
+		return $columns;
 	}
 }
\ No newline at end of file