diff --git a/keybinds.h b/keybinds.h
index e996b6b..2c0bbdf 100644
--- a/keybinds.h
+++ b/keybinds.h
@@ -51,7 +51,7 @@ static Key normkeys[] = {
     { 0,                            XK_minus,     setimgsize,      {.i = -10 } },
     { SHIFT,                        XK_equal,     setimgsize,      {.i = +100 } },
     { SHIFT,                        XK_minus,     setimgsize,      {.i = -100 } },
-    { SHIFT,                        XK_t,         toggleimage,     {0} },
+    { 0,                            XK_t,         toggleimg,       {0} },
 	{ 0,                            XK_k,         move,            {.i = 1  } },
 	{ 0,                            XK_j,         move,            {.i = 2  } },
 	{ 0,                            XK_h,         move,            {.i = 3  } },
diff --git a/libs/draw.c b/libs/draw.c
index 2c2d043..a909d16 100644
--- a/libs/draw.c
+++ b/libs/draw.c
@@ -173,12 +173,9 @@ drawmenu(void)
 
 	if (lines > 0) {
         #if USEIMAGE
-        if (longestedge && !hideimage) {
+        if (!hideimage && longestedge != 0) {
             x += imagegaps + imagewidth;
         }
-
-        if (hideimage)
-            longestedge = imageheight = imagewidth = imagegaps = 0;
         #endif
 		/* draw grid */
 		int i = 0;
diff --git a/libs/img.c b/libs/img.c
index 9152375..14e118a 100644
--- a/libs/img.c
+++ b/libs/img.c
@@ -20,10 +20,7 @@ drawimage(void)
     char *limg = NULL;
 
     if (!lines) return;
-    if (hideimage) {
-        image = NULL;
-        return;
-    }
+    if (hideimage) return;
 
     if (!imagewidth || !imageheight) {
         imagewidth = imageheight = longestedge = imagegaps = 0;
diff --git a/spmenu.c b/spmenu.c
index c22570a..dd2987e 100644
--- a/spmenu.c
+++ b/spmenu.c
@@ -159,7 +159,7 @@ static void quit(const Arg *arg);
 static void complete(const Arg *arg);
 static void savehistory(char *input);
 static void setimgsize(const Arg *arg);
-static void toggleimage(const Arg *arg);
+static void toggleimg(const Arg *arg);
 
 static void drawmenu(void);
 static void calcoffsets(void);
@@ -220,17 +220,18 @@ setimgsize(const Arg *arg)
 }
 
 void
-toggleimage(const Arg *arg)
+toggleimg(const Arg *arg)
 {
     #if !USEIMAGE
-    return
+    return;
     #endif
 
+    cleanupimg();
+
     hideimage = !hideimage;
 
     drawmenu();
-
-    if (!hideimage) drawimage();
+    drawimage();
 }
 
 void