diff --git a/src/content/autofill.css b/src/content/autofill.css
new file mode 100644
index 0000000000..b0edf0318c
--- /dev/null
+++ b/src/content/autofill.css
@@ -0,0 +1,32 @@
+@-webkit-keyframes onepasswordfill {
+    0% {
+        -webkit-transform: scale(1.0,1.0);
+    }
+
+    50% {
+        -webkit-transform: scale(1.2,1.2);
+    }
+
+    100% {
+        -webkit-transform: scale(1.0,1.0);
+    }
+}
+
+@-moz-keyframes onepasswordfill {
+    0% {
+        transform: scale(1.0,1.0);
+    }
+
+    50% {
+        transform: scale(1.2,1.2);
+    }
+
+    100% {
+        transform: scale(1.0,1.0);
+    }
+}
+
+.com-agilebits-onepassword-extension-animated-fill {
+    animation: onepasswordfill 200ms ease-in-out 0ms 1;
+    -webkit-animation: onepasswordfill 200ms ease-in-out 0ms 1;
+}
diff --git a/src/manifest.json b/src/manifest.json
index 0041602b23..90c2dbfd48 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -50,6 +50,18 @@
         "file:///*"
       ],
       "run_at": "document_start"
+    },
+    {
+      "all_frames": true,
+      "css": [
+        "content/autofill.css"
+      ],
+      "matches": [
+        "http://*/*",
+        "https://*/*",
+        "file:///*"
+      ],
+      "run_at": "document_end"
     }
   ],
   "background": {
diff --git a/webpack.common.js b/webpack.common.js
index 0e17f57c09..9ea523dc81 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -92,6 +92,7 @@ module.exports = {
             { from: './src/overlay', to: 'overlay' },
             { from: './src/scripts', to: 'scripts' },
             { from: './src/services', to: 'services' },
+            { from: './src/content/autofill.css', to: 'content' },
             './src/background.js'
         ])
     ],