diff --git a/context.go b/context.go
index 198dd3e349..201d2502a1 100644
--- a/context.go
+++ b/context.go
@@ -82,6 +82,10 @@ func (c *Context) Copy() *Context {
 	cp.Writer = &cp.writermem
 	cp.index = abortIndex
 	cp.handlers = nil
+	cp.Keys = map[string]interface{}{}
+	for k, v := range c.Keys {
+		cp.Keys[k] = v
+	}
 	return &cp
 }
 
diff --git a/context_test.go b/context_test.go
index 758fecdc40..2851bf8b4c 100644
--- a/context_test.go
+++ b/context_test.go
@@ -265,6 +265,8 @@ func TestContextCopy(t *testing.T) {
 	assert.Equal(t, cp.Keys, c.Keys)
 	assert.Equal(t, cp.engine, c.engine)
 	assert.Equal(t, cp.Params, c.Params)
+	cp.Set("foo", "notBar")
+	assert.False(t, cp.Keys["foo"] == c.Keys["foo"])
 }
 
 func TestContextHandlerName(t *testing.T) {