diff --git a/ChangeLog b/ChangeLog
index a40295aa4..665470256 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Nov 3 1998  Felipe A. Rodriguez  <far@ix.netcom.com>
+
+	* NSMenuItem.h ADDITIONAL_WIDTH increase defined size (fix overlap in Edit)
+
 Mon Nov 2 1998  Felipe A. Rodriguez  <far@ix.netcom.com>
 
 	* NSApplication.m optimize event translation, matching and dispatch.  Add
diff --git a/Headers/gnustep/gui/NSMenuItem.h b/Headers/gnustep/gui/NSMenuItem.h
index abf180fb8..821c79fea 100644
--- a/Headers/gnustep/gui/NSMenuItem.h
+++ b/Headers/gnustep/gui/NSMenuItem.h
@@ -93,7 +93,7 @@
 enum {
   INTERCELL_SPACE = 1,
   RIGHT_IMAGE_WIDTH = 12,
-  ADDITIONAL_WIDTH = RIGHT_IMAGE_WIDTH + 6
+  ADDITIONAL_WIDTH = RIGHT_IMAGE_WIDTH + 15
 };
 
 #endif // _GNUstep_H_NSMenuItem
diff --git a/Source/NSView.m b/Source/NSView.m
index 0b03d2e5b..5342c2d8c 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -111,20 +111,19 @@ static NSString	*nsview_thread_key = @"NSViewThreadKey";
 
 + (NSView *)focusView
 {
-  NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
-  NSMutableArray *stack = [dict objectForKey: nsview_thread_key];
-  NSView *current_view = nil;
+NSMutableDictionary *dict = [[NSThread currentThread] threadDictionary];
+NSMutableArray *stack = [dict objectForKey: nsview_thread_key];
+NSView *current_view = nil;
 
-  if (stack)
-    {
-      unsigned count = [stack count];
+	if (stack)
+		{
+		unsigned count = [stack count];
 
-      if (count > 0)
-	{
-	  current_view = [stack objectAtIndex: --count];
-	}
-    }
-  return current_view;
+		if (count > 0)
+			current_view = [stack objectAtIndex: --count];
+		}
+
+	return current_view;
 }
 
 - init
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 25998cc08..56ae3b01b 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -121,13 +121,17 @@ static BOOL _needsFlushWindows = YES;
 //
 - init
 {
-  int style;
+int style;
 
-  NSDebugLog(@"NSWindow -init\n");
-  style = NSTitledWindowMask | NSClosableWindowMask
-    | NSMiniaturizableWindowMask | NSResizableWindowMask;
-  return [self initWithContentRect:NSZeroRect styleMask:style
-	       backing:NSBackingStoreBuffered defer:NO];
+	NSDebugLog(@"NSWindow -init\n");
+
+	style = NSTitledWindowMask | NSClosableWindowMask
+			| NSMiniaturizableWindowMask | NSResizableWindowMask;
+
+	return [self initWithContentRect:NSZeroRect 
+				 styleMask:style
+				 backing:NSBackingStoreBuffered 
+				 defer:NO];
 }
 
 - (void)dealloc
@@ -153,20 +157,24 @@ static BOOL _needsFlushWindows = YES;
 // Initializing and getting a new NSWindow object
 //
 - initWithContentRect:(NSRect)contentRect
-	    styleMask:(unsigned int)aStyle
-	      backing:(NSBackingStoreType)bufferingType
-		defer:(BOOL)flag
+			styleMask:(unsigned int)aStyle
+			backing:(NSBackingStoreType)bufferingType
+			defer:(BOOL)flag
 {
-  NSDebugLog(@"NSWindow -initWithContentRect:\n");
-  return [self initWithContentRect:contentRect styleMask:aStyle
-	       backing:bufferingType defer:flag screen:nil];
+	NSDebugLog(@"NSWindow -initWithContentRect:\n");
+
+	return [self initWithContentRect:contentRect 
+				 styleMask:aStyle
+				 backing:bufferingType 
+				 defer:flag 
+				 screen:nil];
 }
 
 - initWithContentRect:(NSRect)contentRect
-	    styleMask:(unsigned int)aStyle
-	      backing:(NSBackingStoreType)bufferingType
-		defer:(BOOL)flag
-	       screen:aScreen
+			styleMask:(unsigned int)aStyle
+			backing:(NSBackingStoreType)bufferingType
+			defer:(BOOL)flag
+			screen:aScreen
 {
   NSApplication *theApp = [NSApplication sharedApplication];
   NSRect r = [[NSScreen mainScreen] frame];