diff --git a/veejay-current/veejay-client/src/multitrack.c b/veejay-current/veejay-client/src/multitrack.c
index 30358fcc..0e11d0fc 100644
--- a/veejay-current/veejay-client/src/multitrack.c
+++ b/veejay-current/veejay-client/src/multitrack.c
@@ -988,7 +988,7 @@ void		multitrack_configure( void *data, float fps, int video_width, int video_he
 	multitracker_t *mt = (multitracker_t*) data;
 	mt->fps = fps;
 
-	calculate_img_dimension(video_width,video_height,&(mt->width),&(mt->height),&(mt->aspect_ratio),vj_get_preview_box_w(),vj_get_preview_box_h(),1);
+	calculate_img_dimension(video_width,video_height,&(mt->width),&(mt->height),&(mt->aspect_ratio),vj_get_preview_box_w(),vj_get_preview_box_h(),-1);
 
 	*box_w = mt->width;
 	*box_h = mt->height;
diff --git a/veejay-current/veejay-client/src/utils.h b/veejay-current/veejay-client/src/utils.h
index 6b353af2..f4cec67f 100644
--- a/veejay-current/veejay-client/src/utils.h
+++ b/veejay-current/veejay-client/src/utils.h
@@ -23,9 +23,6 @@ int 	status_to_arr( char *status, int *array );
 char   *format_time( int pos , double fps);
 
 
-#define DEFAULT_PREVIEW_WIDTH  520
-#define DEFAULT_PREVIEW_HEIGHT  300
-
 #define MAX_PREVIEW_WIDTH 520
 #define MAX_PREVIEW_HEIGHT 300
 
diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c
index 58f57530..93fe00f2 100644
--- a/veejay-current/veejay-client/src/vj-api.c
+++ b/veejay-current/veejay-client/src/vj-api.c
@@ -6644,8 +6644,8 @@ void	vj_gui_cb(int state, char *hostname, int port_num)
 
 void	vj_gui_setup_defaults( vj_gui_t *gui )
 {
-	gui->config.w = DEFAULT_PREVIEW_WIDTH;
-	gui->config.h = DEFAULT_PREVIEW_HEIGHT;
+	gui->config.w = MAX_PREVIEW_WIDTH;
+	gui->config.h = MAX_PREVIEW_HEIGHT;
 	gui->config.fps = 25.0;
 	gui->config.sampling = 1;
 	gui->config.pixel_format = 1;