diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index 129669fdd..3f71e59a6 100644
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -90,10 +90,17 @@ static void
 _gc_orient(E_Gadcon_Client *gcc)
 {
    Instance *inst;
+   Evas_Coord mw, mh;
    
    inst = gcc->data;
-   e_gadcon_client_aspect_set(gcc, 16, 16);
-   e_gadcon_client_min_size_set(gcc, 16, 16);
+   mw = 0, mh = 0;
+   edje_object_size_min_get(inst->o_battery, &mw, &mh);
+   if ((mw < 1) || (mh < 1))
+     edje_object_size_min_calc(inst->o_battery, &mw, &mh); 
+   if (mw < 4) mw = 4;
+   if (mh < 4) mh = 4;
+   e_gadcon_client_aspect_set(gcc, mw, mh);
+   e_gadcon_client_min_size_set(gcc, mw, mh);
 }
 
 static char *
diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index 6fffddcda..4e091ac56 100644
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -79,10 +79,17 @@ static void
 _gc_orient(E_Gadcon_Client *gcc)
 {
    Instance *inst;
+   Evas_Coord mw, mh;
    
    inst = gcc->data;
-   e_gadcon_client_aspect_set(gcc, 16, 16);
-   e_gadcon_client_min_size_set(gcc, 16, 16);
+   mw = 0, mh = 0;
+   edje_object_size_min_get(inst->o_clock, &mw, &mh);
+   if ((mw < 1) || (mh < 1))
+     edje_object_size_min_calc(inst->o_clock, &mw, &mh);
+   if (mw < 4) mw = 4;
+   if (mh < 4) mh = 4;
+   e_gadcon_client_aspect_set(gcc, mw, mh);
+   e_gadcon_client_min_size_set(gcc, mw, mh);
 }
 
 static char *
diff --git a/src/modules/start/e_mod_main.c b/src/modules/start/e_mod_main.c
index 708edcc48..ecdb42338 100644
--- a/src/modules/start/e_mod_main.c
+++ b/src/modules/start/e_mod_main.c
@@ -94,8 +94,14 @@ _gc_orient(E_Gadcon_Client *gcc)
    Evas_Coord mw, mh;
    
    inst = gcc->data;
-   edje_object_size_min_calc (inst->o_button, &mw, &mh);
-   e_gadcon_client_min_size_set (gcc, mw, mh);
+   mw = 0, mh = 0;
+   edje_object_size_min_get(inst->o_button, &mw, &mh);
+   if ((mw < 1) || (mh < 1))
+     edje_object_size_min_calc(inst->o_button, &mw, &mh);
+   if (mw < 4) mw = 4;
+   if (mh < 4) mh = 4;
+   e_gadcon_client_aspect_set(gcc, mw, mh);
+   e_gadcon_client_min_size_set(gcc, mw, mh);
 }
    
 static char *