diff --git a/grid_field_formatter.module b/grid_field_formatter.module
index 0cad556..4442aea 100644
--- a/grid_field_formatter.module
+++ b/grid_field_formatter.module
@@ -163,7 +163,7 @@ function grid_field_formatter_field_attach_view_alter(&$output, $context) {
 
     // Override field theme with grid_field_formatter.
     $output[$field_name]['#theme'] = 'grid_field_formatter';
-    $output[$field_name]['columns'] = (isset($settings['grid_field_formatter']['columns'])) ? $settings['grid_field_formatter']['columns'] : 1;
+    $output[$field_name]['#columns'] = (isset($settings['grid_field_formatter']['columns'])) ? $settings['grid_field_formatter']['columns'] : 1;
   }
 }
 
@@ -207,7 +207,7 @@ function template_preprocess_grid_field_formatter(&$variables, $hook) {
   // Extend the core field module theming functions.
   template_preprocess_field($variables, $hook);
 
-  $variables['columns'] = $variables['element']['columns'];
+  $variables['columns'] = $variables['element']['#columns'];
   // Add specific suggestions that can override the default implementation.
   $variables['theme_hook_suggestions'] = array(
     'grid_field_formatter__' . $variables['element']['#field_type'],