diff --git a/src/nsterm.m b/src/nsterm.m
index 5127739e2d9..74ee1219bbc 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -1637,6 +1637,7 @@ Hide the window (X11 semantics)
 
   [[view window] close];
   [view removeFromSuperview];
+  [view release];
 
   xfree (f->output_data.ns);
   f->output_data.ns = NULL;
@@ -6844,6 +6845,14 @@ - (void)dealloc
 
   if (fs_state == FULLSCREEN_BOTH)
     [nonfs_window release];
+
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400
+  /* Release layer and menu */
+  EmacsLayer *layer = (EmacsLayer *)[self layer];
+  [layer release];
+#endif
+
+  [[self menu] release];
   [super dealloc];
 }
 
@@ -9599,8 +9608,9 @@ - (void)dealloc
   NSTRACE ("[EmacsWindow dealloc]");
 
   /* We need to release the toolbar ourselves.  */
-  [self setToolbar: nil];
   [[self toolbar] release];
+  [self setToolbar: nil];
+
 
   /* Also the last button press event .  */
   if (last_drag_event)