diff --git a/src/bin/e_config_dialog.c b/src/bin/e_config_dialog.c
index 67f99514f..3175642b1 100644
--- a/src/bin/e_config_dialog.c
+++ b/src/bin/e_config_dialog.c
@@ -188,7 +188,13 @@ _e_config_dialog_go(E_Config_Dialog *cfd, E_Config_Dialog_CFData_Type type)
         if ((cfd->view->normal_win) || (e_config->cfgdlg_normal_wins))
           cfd->dia = e_dialog_normal_win_new(cfd->parent, cfd->name, buf);
         else
-          cfd->dia = e_dialog_new(cfd->parent, cfd->name, buf);
+          {
+#warning REMOVE STUPID ELM HACK FOR WAYLAND BEFORE RELEASE
+             if (e_comp && e_comp->comp_type != E_PIXMAP_TYPE_WL)
+               cfd->dia = e_dialog_new(cfd->parent, cfd->name, buf);
+             else
+               cfd->dia = e_dialog_normal_win_new(cfd->parent, cfd->name, buf);
+          }
         e_object_del_attach_func_set(E_OBJECT(cfd->dia),
                                      _e_config_dialog_cb_dialog_del);
      } /* window was created before - deleting content only */