diff --git a/base/VulkanUIOverlay.cpp b/base/VulkanUIOverlay.cpp
index be4722c7..0ad45d72 100644
--- a/base/VulkanUIOverlay.cpp
+++ b/base/VulkanUIOverlay.cpp
@@ -1,4 +1,3 @@
-#include "VulkanUIOverlay.h"
 /*
 * UI overlay class using ImGui
 *
@@ -11,7 +10,7 @@
 
 namespace vks 
 {
-	UIOverlay::UIOverlay(vks::VulkanDevice *vulkanDevice, VkQueue copyQueue, std::vector<VkFramebuffer> &framebuffers, VkFormat colorformat, VkFormat depthformat, uint32_t *framebufferwidth, uint32_t *framebufferheight, std::vector<VkPipelineShaderStageCreateInfo> shaderstages) 
+	UIOverlay::UIOverlay(vks::VulkanDevice *vulkanDevice, VkQueue copyQueue, std::vector<VkFramebuffer> &framebuffers, VkFormat colorformat, VkFormat depthformat, uint32_t width, uint32_t height, std::vector<VkPipelineShaderStageCreateInfo> shaderstages) 
 	{
 		this->device = vulkanDevice;
 		this->copyQueue = copyQueue;
@@ -25,8 +24,8 @@ namespace vks
 
 		this->shaderStages = shaderstages;
 
-		this->frameBufferWidth = framebufferwidth;
-		this->frameBufferHeight = framebufferheight;
+		this->width = width;
+		this->height = height;
 
 	#if defined(__ANDROID__)		
 		if (vks::android::screenDensity >= ACONFIGURATION_DENSITY_XXHIGH) {
@@ -53,7 +52,7 @@ namespace vks
 		style.Colors[ImGuiCol_CheckMark] = ImVec4(1.0f, 0.0f, 0.0f, 0.8f);
 		// Dimensions
 		ImGuiIO& io = ImGui::GetIO();
-		io.DisplaySize = ImVec2((float)(*framebufferwidth), (float)(*framebufferheight));
+		io.DisplaySize = ImVec2((float)(width), (float)(height));
 		io.FontGlobalScale = scale;
 
 		cmdBuffers.resize(framebuffers.size());
@@ -408,8 +407,8 @@ namespace vks
 
 		VkRenderPassBeginInfo renderPassBeginInfo = vks::initializers::renderPassBeginInfo();
 		renderPassBeginInfo.renderPass = renderPass;
-		renderPassBeginInfo.renderArea.extent.width = *frameBufferWidth;
-		renderPassBeginInfo.renderArea.extent.height = *frameBufferHeight;
+		renderPassBeginInfo.renderArea.extent.width = width;
+		renderPassBeginInfo.renderArea.extent.height = height;
 		// None of the attachments will be cleared
 		renderPassBeginInfo.clearValueCount = 0;
 		renderPassBeginInfo.pClearValues = nullptr;
@@ -532,6 +531,15 @@ namespace vks
 		}
 	}
 
+	void UIOverlay::resize(uint32_t width, uint32_t height)
+	{
+		ImGuiIO& io = ImGui::GetIO();
+		io.DisplaySize = ImVec2((float)(width), (float)(height));
+		this->width = width;
+		this->height = height;
+		updateCommandBuffers();
+	}
+
 	/** Submit the overlay command buffers to a queue */
 	void UIOverlay::submit(VkQueue queue, uint32_t bufferindex, VkSubmitInfo submitInfo)
 	{
@@ -548,15 +556,6 @@ namespace vks
 		VK_CHECK_RESULT(vkResetFences(device->logicalDevice, 1, &fence));
 	}
 
-	/** Reallocate command buffers for the text overlay */
-	void UIOverlay::reallocateCommandBuffers()
-	{
-		vkFreeCommandBuffers(device->logicalDevice, commandPool, static_cast<uint32_t>(cmdBuffers.size()), cmdBuffers.data());
-		VkCommandBufferAllocateInfo cmdBufAllocateInfo =
-			vks::initializers::commandBufferAllocateInfo(commandPool, VK_COMMAND_BUFFER_LEVEL_PRIMARY, static_cast<uint32_t>(cmdBuffers.size()));
-		VK_CHECK_RESULT(vkAllocateCommandBuffers(device->logicalDevice, &cmdBufAllocateInfo, cmdBuffers.data()));
-	}
-
 	bool UIOverlay::header(const char *caption)
 	{
 		return ImGui::CollapsingHeader(caption, ImGuiTreeNodeFlags_DefaultOpen);
diff --git a/base/VulkanUIOverlay.h b/base/VulkanUIOverlay.h
index c32b656f..f1a9e005 100644
--- a/base/VulkanUIOverlay.h
+++ b/base/VulkanUIOverlay.h
@@ -39,8 +39,8 @@ namespace vks
 		VkFormat colorFormat;
 		VkFormat depthFormat;
 
-		uint32_t *frameBufferWidth;
-		uint32_t *frameBufferHeight;
+		uint32_t width;
+		uint32_t height;
 
 		vks::Buffer vertexBuffer;
 		vks::Buffer indexBuffer;
@@ -79,11 +79,11 @@ namespace vks
 
 		std::vector<VkCommandBuffer> cmdBuffers;
 
-		UIOverlay(vks::VulkanDevice *vulkanDevice, VkQueue copyQueue, std::vector<VkFramebuffer> &framebuffers, VkFormat colorformat, VkFormat depthformat, uint32_t *framebufferwidth,	uint32_t *framebufferheight, std::vector<VkPipelineShaderStageCreateInfo> shaderstages);
+		UIOverlay(vks::VulkanDevice *vulkanDevice, VkQueue copyQueue, std::vector<VkFramebuffer> &framebuffers, VkFormat colorformat, VkFormat depthformat, uint32_t width, uint32_t height, std::vector<VkPipelineShaderStageCreateInfo> shaderstages);
 		~UIOverlay();
 
-		void reallocateCommandBuffers();
 		void update();
+		void resize(uint32_t width, uint32_t height);
 
 		void submit(VkQueue queue, uint32_t bufferindex, VkSubmitInfo submitInfo);
 
diff --git a/base/vulkanexamplebase.cpp b/base/vulkanexamplebase.cpp
index 944aaff5..a063ae69 100644
--- a/base/vulkanexamplebase.cpp
+++ b/base/vulkanexamplebase.cpp
@@ -192,7 +192,7 @@ void VulkanExampleBase::prepare()
 			loadShader(getAssetPath() + "shaders/base/uioverlay.vert.spv", VK_SHADER_STAGE_VERTEX_BIT),
 			loadShader(getAssetPath() + "shaders/base/uioverlay.frag.spv", VK_SHADER_STAGE_FRAGMENT_BIT),
 		};
-		UIOverlay = new vks::UIOverlay(vulkanDevice, queue, frameBuffers, swapChain.colorFormat, depthFormat, &width, &height, shaderStages);
+		UIOverlay = new vks::UIOverlay(vulkanDevice, queue, frameBuffers, swapChain.colorFormat, depthFormat, width, height, shaderStages);
 		updateOverlay();
 	}
 }
@@ -2096,14 +2096,11 @@ void VulkanExampleBase::windowResize()
 	setupSwapChain();
 
 	// Recreate the frame buffers
-
 	vkDestroyImageView(device, depthStencil.view, nullptr);
 	vkDestroyImage(device, depthStencil.image, nullptr);
 	vkFreeMemory(device, depthStencil.mem, nullptr);
-	setupDepthStencil();
-	
-	for (uint32_t i = 0; i < frameBuffers.size(); i++)
-	{
+	setupDepthStencil();	
+	for (uint32_t i = 0; i < frameBuffers.size(); i++) {
 		vkDestroyFramebuffer(device, frameBuffers[i], nullptr);
 	}
 	setupFrameBuffer();
@@ -2117,9 +2114,7 @@ void VulkanExampleBase::windowResize()
 	vkDeviceWaitIdle(device);
 
 	if (settings.overlay) {
-		// TODO: Check if still required
-		UIOverlay->reallocateCommandBuffers();
-		updateOverlay();
+		UIOverlay->resize(width, height);
 	}
 
 	camera.updateAspectRatio((float)width / (float)height);