diff --git a/src/grid-item/index.js b/src/grid-item/index.js
index 0f3930e14..1d6a3cfbd 100644
--- a/src/grid-item/index.js
+++ b/src/grid-item/index.js
@@ -82,7 +82,7 @@ export default createComponent({
     const { center, border, square, gutter, clickable } = this.parent;
 
     return (
-      <div class={[bem({ square })]} style={this.style} onClick={this.onClick}>
+      <div class={[bem({ square })]} style={this.style}>
         <div
           style={this.contentStyle}
           role={clickable ? 'button' : null}
@@ -96,6 +96,7 @@ export default createComponent({
             }),
             { [BORDER]: border }
           ]}
+          onClick={this.onClick}
         >
           {this.renderContent()}
         </div>
diff --git a/src/grid/test/index.spec.js b/src/grid/test/index.spec.js
index a403ad27e..a53544cbc 100644
--- a/src/grid/test/index.spec.js
+++ b/src/grid/test/index.spec.js
@@ -19,7 +19,7 @@ test('click grid item', () => {
     }
   });
 
-  const Item = wrapper.find('.van-grid-item');
+  const Item = wrapper.find('.van-grid-item__content');
   Item.trigger('click');
 
   expect(onClick).toHaveBeenCalledTimes(1);