diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index d78c63b5d0..742517998f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -893,8 +893,6 @@ void Application::paintGL() {
     PerformanceWarning warn(showWarnings, "Application::paintGL()");
     resizeGL();
 
-    glEnable(GL_LINE_SMOOTH);
-
     {
         PerformanceTimer perfTimer("renderOverlay");
         
@@ -905,6 +903,7 @@ void Application::paintGL() {
         _applicationOverlay.renderOverlay(&renderArgs);
     }
 
+    glEnable(GL_LINE_SMOOTH);
 
     if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON || _myCamera.getMode() == CAMERA_MODE_THIRD_PERSON) {
         Menu::getInstance()->setIsOptionChecked(MenuOption::FirstPerson, _myAvatar->getBoomLength() <= MyAvatar::ZOOM_MIN);
diff --git a/libraries/render-utils/src/FramebufferCache.cpp b/libraries/render-utils/src/FramebufferCache.cpp
index ba724d05e8..8e16eeec62 100644
--- a/libraries/render-utils/src/FramebufferCache.cpp
+++ b/libraries/render-utils/src/FramebufferCache.cpp
@@ -39,6 +39,7 @@ void FramebufferCache::setFrameBufferSize(QSize frameBufferSize) {
         _primaryColorTexture.reset();
         _primaryNormalTexture.reset();
         _primarySpecularTexture.reset();
+        _cachedFramebuffers.clear();
     }
 }
 
@@ -129,7 +130,9 @@ gpu::FramebufferPointer FramebufferCache::getFramebuffer() {
 
 
 void FramebufferCache::releaseFramebuffer(const gpu::FramebufferPointer& framebuffer) {
-    _cachedFramebuffers.push_back(framebuffer);
+    if (QSize(framebuffer->getSize().x, framebuffer->getSize().y) == _frameBufferSize) {
+        _cachedFramebuffers.push_back(framebuffer);
+    }
 }
 
 gpu::FramebufferPointer FramebufferCache::getShadowFramebuffer() {