diff --git a/legacy/evas/src/bin/evas_software_x11_main.c b/legacy/evas/src/bin/evas_software_x11_main.c
index 9a5d3924c2..bda14bb431 100644
--- a/legacy/evas/src/bin/evas_software_x11_main.c
+++ b/legacy/evas/src/bin/evas_software_x11_main.c
@@ -50,6 +50,7 @@ main(int argc, char **argv)
    XSync(disp, False);
 
    /* test evas_free....  :) */
+   evas_init();
    evas = evas_new();
    evas_output_method_set(evas, evas_render_method_lookup("software_x11"));
    evas_output_size_set(evas, win_w, win_h);
@@ -71,6 +72,7 @@ main(int argc, char **argv)
    }
    setup();
    printf("################ evas free\n");
+   setdown();
    evas_free(evas);
    printf("evas freed. DONE\n");
 
@@ -95,6 +97,7 @@ main(int argc, char **argv)
    }
    setup();
    printf("################ evas free\n");
+   setdown();
    evas_free(evas);
    printf("evas freed. DONE\n");
 
@@ -119,6 +122,7 @@ main(int argc, char **argv)
    }
    setup();
    printf("################ evas free\n");
+   setdown();
    evas_free(evas);
    printf("evas freed. DONE\n");
 
@@ -143,6 +147,7 @@ main(int argc, char **argv)
    }
    setup();
    printf("################ evas free\n");
+   setdown();
    evas_free(evas);
    printf("evas freed. DONE\n");
 
@@ -183,7 +188,13 @@ main(int argc, char **argv)
 	       {
 	       case ButtonPress:
 		  if (ev.xbutton.button == 3)
+		  {
+			  setdown();
+			  evas_free(evas);
+			  XCloseDisplay(disp);
+			  evas_shutdown();
 		     exit(0);
+		  }
 #if 0
 		  if (!pause_me)
 		     pause_me = 1;
@@ -227,5 +238,11 @@ main(int argc, char **argv)
 	if (pause_me == 2)
 	   usleep(100000);
      }
+
+   setdown();
+   evas_free(evas);
+   XCloseDisplay(disp);
+   evas_shutdown();
+
    return 0;
 }