diff --git a/CHANGELOG.md b/CHANGELOG.md
index 971039743..6c99370ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### v2.9.18 
+*2014-04-19*
+
+**Zixaphir**
+- Expand Image bugfix.
+
 ### v2.9.17 
 *2014-04-19*
 
diff --git a/LICENSE b/LICENSE
index 2cbcd37ee..ecb085517 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
 /*
-* appchan x - Version 2.9.17 - 2014-04-19
+* appchan x - Version 2.9.18 - 2014-04-19
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
diff --git a/builds/appchan-x.meta.js b/builds/appchan-x.meta.js
index 96888e9fa..090908fe9 100644
--- a/builds/appchan-x.meta.js
+++ b/builds/appchan-x.meta.js
@@ -1,6 +1,6 @@
 // ==UserScript==
 // @name         appchan x
-// @version      2.9.17
+// @version      2.9.18
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    zixaphir
diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 0c5dbaf88..19cadacbd 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -1,7 +1,7 @@
 // Generated by CoffeeScript
 // ==UserScript==
 // @name         appchan x
-// @version      2.9.17
+// @version      2.9.18
 // @minGMVer     1.14
 // @minFFVer     26
 // @namespace    zixaphir
@@ -25,7 +25,7 @@
 // ==/UserScript==
 
 /*
-* appchan x - Version 2.9.17 - 2014-04-19
+* appchan x - Version 2.9.18 - 2014-04-19
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -483,7 +483,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '2.9.17',
+    VERSION: '2.9.18',
     NAMESPACE: 'appchan_x.',
     boards: {}
   };
@@ -10765,6 +10765,7 @@
       }
       $.addClass(thumb, 'expanding');
       if (el = post.file.fullImage) {
+        el.className = 'full-image';
         TrashQueue.remove(el);
       } else {
         el = post.file.fullImage = $.el((isVideo ? 'video' : 'img'), {
@@ -11017,6 +11018,7 @@
       isVideo = post.file.isVideo;
       if (post.file.fullImage) {
         el = post.file.fullImage;
+        el.className = '';
         TrashQueue.remove(el);
       } else {
         el = $.el((isVideo ? 'video' : 'img'), {
diff --git a/builds/appchan-x.zip b/builds/appchan-x.zip
index 2e43f71d1..40125ded2 100644
Binary files a/builds/appchan-x.zip and b/builds/appchan-x.zip differ
diff --git a/builds/crx/manifest.json b/builds/crx/manifest.json
index 817776644..6065da8b5 100644
--- a/builds/crx/manifest.json
+++ b/builds/crx/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan x",
-  "version": "2.9.17",
+  "version": "2.9.18",
   "manifest_version": 2,
   "description": "The most comprehensive 4chan userscript.",
   "icons": {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index 913d4617a..352804322 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -1,6 +1,6 @@
 // Generated by CoffeeScript
 /*
-* appchan x - Version 2.9.17 - 2014-04-19
+* appchan x - Version 2.9.18 - 2014-04-19
 *
 * Licensed under the MIT license.
 * https://github.com/zixaphir/appchan-x/blob/master/LICENSE
@@ -458,7 +458,7 @@
   doc = d.documentElement;
 
   g = {
-    VERSION: '2.9.17',
+    VERSION: '2.9.18',
     NAMESPACE: 'appchan_x.',
     boards: {}
   };
@@ -10801,6 +10801,7 @@
       }
       $.addClass(thumb, 'expanding');
       if (el = post.file.fullImage) {
+        el.className = 'full-image';
         TrashQueue.remove(el);
       } else {
         el = post.file.fullImage = $.el((isVideo ? 'video' : 'img'), {
@@ -11042,6 +11043,7 @@
       isVideo = post.file.isVideo;
       if (post.file.fullImage) {
         el = post.file.fullImage;
+        el.className = '';
         TrashQueue.remove(el);
       } else {
         el = $.el((isVideo ? 'video' : 'img'), {
diff --git a/package.json b/package.json
index c8ebf48f4..e92378b27 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "appchan-x",
-  "version": "2.9.17",
+  "version": "2.9.18",
   "description": "The most comprehensive 4chan userscript.",
   "meta": {
     "name": "appchan x",
diff --git a/src/Images/ImageExpand.coffee b/src/Images/ImageExpand.coffee
index 3117402c8..96ae95e17 100644
--- a/src/Images/ImageExpand.coffee
+++ b/src/Images/ImageExpand.coffee
@@ -128,6 +128,7 @@ ImageExpand =
     $.addClass thumb, 'expanding'
     if el = post.file.fullImage
       # Expand already-loaded/ing picture.
+      el.className = 'full-image'
       TrashQueue.remove el
     else
       el = post.file.fullImage = $.el (if isVideo then 'video' else 'img'),
diff --git a/src/Images/ImageHover.coffee b/src/Images/ImageHover.coffee
index 746b982b4..93f491644 100755
--- a/src/Images/ImageHover.coffee
+++ b/src/Images/ImageHover.coffee
@@ -22,6 +22,7 @@ ImageHover =
     {isVideo} = post.file
     if post.file.fullImage
       el = post.file.fullImage
+      el.className = ''
       TrashQueue.remove el
     else
       el = $.el (if isVideo then 'video' else 'img'),